avcodec/rv34: Clear pointers in ff_rv34_decode_init_thread_copy()
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 18 Jul 2015 09:24:45 +0000 (11:24 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 18 Jul 2015 09:28:17 +0000 (11:28 +0200)
Avoids leaving stale pointers
Fixes: signal_sigabrt_7ffff70eccc9_819_sabtriple.rm with memlimit 536870912

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/rv34.c

index c109a9e..51e0f40 100644 (file)
@@ -1534,7 +1534,14 @@ int ff_rv34_decode_init_thread_copy(AVCodecContext *avctx)
 
     if (avctx->internal->is_copy) {
         r->tmp_b_block_base = NULL;
+        r->cbp_chroma       = NULL;
+        r->cbp_luma         = NULL;
+        r->deblock_coefs    = NULL;
+        r->intra_types_hist = NULL;
+        r->mb_type          = NULL;
+
         ff_mpv_idct_init(&r->s);
+
         if ((err = ff_mpv_common_init(&r->s)) < 0)
             return err;
         if ((err = rv34_decoder_alloc(r)) < 0) {