[FFmpeg-cvslog] Avoid a null pointer dereference on oom when decoding smacker.

Carl Eugen Hoyos git at videolan.org
Sat Jun 29 17:45:24 CEST 2013


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Jun 29 16:04:07 2013 +0200| [90bd75e6eb789d196fef0135a58bcfe7904c65c5] | committer: Carl Eugen Hoyos

Avoid a null pointer dereference on oom when decoding smacker.

Fixes ticket #2728.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90bd75e6eb789d196fef0135a58bcfe7904c65c5
---

 libavcodec/smacker.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index d0a10bf..0af11a9 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -261,6 +261,8 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int
     huff.maxlength = 0;
     huff.current = 0;
     huff.values = av_mallocz(huff.length * sizeof(int));
+    if (!huff.values)
+        return AVERROR(ENOMEM);
 
     if (smacker_decode_bigtree(gb, &huff, &ctx) < 0)
         err = -1;



More information about the ffmpeg-cvslog mailing list