From 8a3b85f3a7952c54a2c36ba1797f7e0cde9f85aa Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 4 Feb 2014 02:20:59 +0100 Subject: [PATCH] avcodec/h264: update current_sps & sps->new only after the whole slice header decoder and init code finished This avoids them being cleared before the full initialization finished Fixes out of array read Fixes: asan_heap-oob_f0c5e6_7071_cov_1605985132_mov_h264_aac__Demo_FlagOfOurFathers.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/h264.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 9fa2954b3d..70952f2c07 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3526,9 +3526,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) if (h->pps.sps_id != h->current_sps_id || h0->sps_buffers[h->pps.sps_id]->new) { - h0->sps_buffers[h->pps.sps_id]->new = 0; - h->current_sps_id = h->pps.sps_id; h->sps = *h0->sps_buffers[h->pps.sps_id]; if (h->mb_width != h->sps.mb_width || @@ -4111,6 +4109,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0) if (h->ref_count[1]) h->er.next_pic = &h->ref_list[1][0]; h->er.ref_count = h->ref_count[0]; h0->au_pps_id = pps_id; + h->sps.new = + h0->sps_buffers[h->pps.sps_id]->new = 0; + h->current_sps_id = h->pps.sps_id; if (h->avctx->debug & FF_DEBUG_PICT_INFO) { av_log(h->avctx, AV_LOG_DEBUG,