From be30e44dd929c2557494b1b71084d48d3c002f15 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 25 Aug 2013 03:29:52 +0200 Subject: [PATCH] avcodec/h264: Zero rbsp_buffer earler to ensure no duplicated pointers can leak Signed-off-by: Michael Niedermayer --- libavcodec/h264.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e17807339d..d328610fe9 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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;