diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 02:20:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-23 14:49:47 +0100 |
| commit | e7b7e694168663813fdf1e99e0d1142cfd88e44b (patch) | |
| tree | 5f5a7729a8424146345d0b24265c220246669f2e | |
| parent | 9330bcff9ba2e74cc13630cb607a11753c1c212c (diff) | |
| download | ffmpeg-e7b7e694168663813fdf1e99e0d1142cfd88e44b.tar.gz | |
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 <michaelni@gmx.at>
(cherry picked from commit 8a3b85f3a7952c54a2c36ba1797f7e0cde9f85aa)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 7b240a22fd..3e209c3e9c 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3447,9 +3447,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 || @@ -4029,6 +4027,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, |