mpeg12dec: reset data size after parsing extradata.
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Apr 2012 18:03:53 +0000 (20:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Apr 2012 18:03:53 +0000 (20:03 +0200)
This ended up corrupting data structures and may possibly
lead to a double free.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12.c

index ea19b81..b66d535 100644 (file)
@@ -2289,6 +2289,7 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
 
     if (avctx->extradata && !avctx->frame_number) {
         int ret = decode_chunks(avctx, picture, data_size, avctx->extradata, avctx->extradata_size);
+        *data_size = 0;
         if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
             return ret;
     }