avcodec/h264: Zero rbsp_buffer earler to ensure no duplicated pointers can leak
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Aug 2013 01:29:52 +0000 (03:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Aug 2013 01:29:52 +0000 (03:29 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c

index e178073..d328610 100644 (file)
@@ -1787,6 +1787,10 @@ static int decode_update_thread_context(AVCodecContext *dst,
         h->mb_type_pool      = NULL;
         h->ref_index_pool    = NULL;
         h->motion_val_pool   = NULL;
+        for (i = 0; i < 2; i++) {
+            h->rbsp_buffer[i] = NULL;
+            h->rbsp_buffer_size[i] = 0;
+        }
 
         if (h1->context_initialized) {
         h->context_initialized = 0;
@@ -1807,10 +1811,6 @@ static int decode_update_thread_context(AVCodecContext *dst,
         }
         }
 
-        for (i = 0; i < 2; i++) {
-            h->rbsp_buffer[i]      = NULL;
-            h->rbsp_buffer_size[i] = 0;
-        }
         h->bipred_scratchpad = NULL;
         h->edge_emu_buffer   = NULL;