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

avformat/ffmdec: cleanup on extradata memory allocation failure 

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-12-03 18:32:04 +01:00
parent fdf588d7cf
commit b98510de5c
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/ffmdec.c
View File

@ -379,8 +379,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
goto fail;
}
codecpar->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!codecpar->extradata)
return AVERROR(ENOMEM);
if (!codecpar->extradata) {
ret = AVERROR(ENOMEM);
goto fail;
}
codecpar->extradata_size = size;
avio_read(pb, codecpar->extradata, size);
}
@ -690,8 +692,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
goto fail;
}
codecpar->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!codecpar->extradata)
return AVERROR(ENOMEM);
if (!codecpar->extradata) {
ret = AVERROR(ENOMEM);
goto fail;
}
codecpar->extradata_size = size;
avio_read(pb, codecpar->extradata, size);
}