RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'c571424c7f6276a6374e1784ce2a33d4b6a4292d' 

* commit 'c571424c7f6276a6374e1784ce2a33d4b6a4292d':
  asfdec: prevent memory leaks found with Coverity Scan

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-14 00:54:51 +02:00
parent 4bde1a4a37 c571424c7f
commit db1ab7e5af
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/asfdec_o.c
View File

@ -281,8 +281,10 @@ static int asf_read_value(AVFormatContext *s, uint8_t *name, uint16_t name_len,
av_log(s, AV_LOG_WARNING, "av_dict_set failed.\n"); av_log(s, AV_LOG_WARNING, "av_dict_set failed.\n");
} else { } else {
char buf[256]; char buf[256];
if (val_len > sizeof(buf)) if (val_len > sizeof(buf)) {
return AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto failed;
}
if ((ret = avio_read(pb, value, val_len)) < 0) if ((ret = avio_read(pb, value, val_len)) < 0)
goto failed; goto failed;
if (ret < 2 * val_len) if (ret < 2 * val_len)
@ -404,8 +406,10 @@ static int asf_read_picture(AVFormatContext *s, int len)
} }
asf->asf_st[asf->nb_streams] = av_mallocz(sizeof(*asf_st)); asf->asf_st[asf->nb_streams] = av_mallocz(sizeof(*asf_st));
asf_st = asf->asf_st[asf->nb_streams]; asf_st = asf->asf_st[asf->nb_streams];
if (!asf_st) if (!asf_st) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail;
}
st->disposition |= AV_DISPOSITION_ATTACHED_PIC; st->disposition |= AV_DISPOSITION_ATTACHED_PIC;
st->codec->codec_type = asf_st->type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = asf_st->type = AVMEDIA_TYPE_VIDEO;