generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: reset data partitioning at the beginning of each decode call

Browse Source 
Prevents using GetBitContexts with data from previous calls.

Fixes 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
committed by Sean McGovern
parent 7e8d27c851
commit d8e89a3726
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/h264.c
View File

@@ -4059,6 +4059,13 @@ again:
} }
break; break;
case NAL_DPA: case NAL_DPA:
if (s->flags2 & CODEC_FLAG2_CHUNKS) {
av_log(h->s.avctx, AV_LOG_ERROR,
"Decoding in chunks is not supported for "
"partitioned slices.\n");
return AVERROR(ENOSYS);
}
init_get_bits(&hx->s.gb, ptr, bit_length); init_get_bits(&hx->s.gb, ptr, bit_length);
hx->intra_gb_ptr = hx->intra_gb_ptr =
hx->inter_gb_ptr = NULL; hx->inter_gb_ptr = NULL;
@@ -4191,6 +4198,9 @@ static int decode_frame(AVCodecContext *avctx, void *data,
s->flags = avctx->flags; s->flags = avctx->flags;
s->flags2 = avctx->flags2; s->flags2 = avctx->flags2;
/* reset data partitioning here, to ensure GetBitContexts from previous
* packets do not get used. */
s->data_partitioning = 0;
/* end of stream, output what is still in the buffers */ /* end of stream, output what is still in the buffers */
out: out: