highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

h264: reset ref count if decoding the slice header fails

Browse Source 
Otherwise the ER code might try to use some already freed references.

Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
This commit is contained in:
Anton Khirnov
2013-11-28 10:54:35 +01:00
parent 98cc9efc5f
commit 0652e024c6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/h264.c
View File

@@ -4813,9 +4813,10 @@ again:
context_count = 0; context_count = 0;
} }
if (err < 0) if (err < 0) {
av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n"); av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
else if (err == 1) { h->ref_count[0] = h->ref_count[1] = h->list_count = 0;
} else if (err == 1) {
/* Slice could not be decoded in parallel mode, copy down /* Slice could not be decoded in parallel mode, copy down
* NAL unit stuff to context 0 and restart. Note that * NAL unit stuff to context 0 and restart. Note that
* rbsp_buffer is not transferred, but since we no longer * rbsp_buffer is not transferred, but since we no longer