[FFmpeg-cvslog] libnut: check for av_malloc failure.
Michael Niedermayer
git at videolan.org
Thu Dec 8 21:29:51 CET 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 28 05:23:48 2011 +0100| [6f7f2396049575fcf2054b4dafa19ca01381638e] | committer: Michael Niedermayer
libnut: check for av_malloc failure.
No, ive no testcase, i just spoted these when looking ...
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f7f2396049575fcf2054b4dafa19ca01381638e
---
libavformat/libnut.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/libavformat/libnut.c b/libavformat/libnut.c
index eafe816..9f64544 100644
--- a/libavformat/libnut.c
+++ b/libavformat/libnut.c
@@ -71,6 +71,8 @@ static int nut_write_header(AVFormatContext * avf) {
int i;
priv->s = s = av_mallocz((avf->nb_streams + 1) * sizeof*s);
+ if(!s)
+ return AVERROR(ENOMEM);
for (i = 0; i < avf->nb_streams; i++) {
AVCodecContext * codec = avf->streams[i]->codec;
@@ -224,6 +226,10 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) {
st->codec->extradata_size = s[i].codec_specific_len;
if (st->codec->extradata_size) {
st->codec->extradata = av_mallocz(st->codec->extradata_size);
+ if(!st->codec->extradata){
+ nut_demuxer_uninit(nut);
+ return AVERROR(ENOMEM);
+ }
memcpy(st->codec->extradata, s[i].codec_specific, st->codec->extradata_size);
}
More information about the ffmpeg-cvslog
mailing list