Fix memory leaks on failed ff_h264_decode_init()
authorDale Curtis <dalecurtis@chromium.org>
Tue, 10 Apr 2012 18:31:03 +0000 (11:31 -0700)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Apr 2012 13:54:53 +0000 (15:54 +0200)
During failure conditions ff_h264_decode_init() leaks memory
allocated for nal units.  Found via valgrind.

Valgrind traces: http://pastebin.com/GqTqxs8T

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c

index b909600..2903cf9 100644 (file)
@@ -1251,8 +1251,10 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
     }
 
     if (avctx->extradata_size > 0 && avctx->extradata &&
-        ff_h264_decode_extradata(h, avctx->extradata, avctx->extradata_size) < 0)
+        ff_h264_decode_extradata(h, avctx->extradata, avctx->extradata_size) < 0) {
+        ff_h264_free_context(h);
         return -1;
+    }
 
     if (h->sps.bitstream_restriction_flag &&
         s->avctx->has_b_frames < h->sps.num_reorder_frames) {