diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-20 19:43:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-20 19:53:54 +0100 |
| commit | da7672b20a746643bb13899dc7f934d7f5db466f (patch) | |
| tree | 7f1d1bf89887ef1eb59597900aa37f56b59caff5 /libavcodec/h264.c | |
| parent | 039f55c80333a9db0e64e5c975b0820bff01c5e2 (diff) | |
| download | ffmpeg-da7672b20a746643bb13899dc7f934d7f5db466f.tar.gz | |
h264: Fix handling of changing reference counts between slices
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index acdf2a183f..124215c279 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1655,6 +1655,7 @@ static int decode_update_thread_context(AVCodecContext *dst, h->last_slice_type = h1->last_slice_type; h->sync = h1->sync; + memcpy(h->last_ref_count, h1->last_ref_count, sizeof(h->last_ref_count)); if (context_reinitialized) h264_set_parameter_from_sps(h); @@ -3103,7 +3104,9 @@ static int decode_slice_header(H264Context *h, H264Context *h0) slice_type = golomb_to_pict_type[slice_type]; if (slice_type == AV_PICTURE_TYPE_I || - (h0->current_slice != 0 && slice_type == h0->last_slice_type)) { + (h0->current_slice != 0 && + slice_type == h0->last_slice_type && + !memcmp(h0->last_ref_count, h0->ref_count, sizeof(h0->ref_count)))) { default_ref_list_done = 1; } h->slice_type = slice_type; @@ -3672,6 +3675,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) 6 * (h->sps.bit_depth_luma - 8); h0->last_slice_type = slice_type; + memcpy(h0->last_ref_count, h0->ref_count, sizeof(h0->last_ref_count)); h->slice_num = ++h0->current_slice; if (h->slice_num) |