videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-08 08:55:34 +02:00
Code Releases Activity

avcodec/h264: Check init_get_bits8() for failure

Browse Source 
Fixes CID1361935

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-05-19 00:19:52 +02:00
parent 4a81bddb4d
commit 641dccc2aa
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h264.c
View File

@ -1007,6 +1007,7 @@ static int get_last_needed_nal(H264Context *h)
int nals_needed = 0; int nals_needed = 0;
int first_slice = 0; int first_slice = 0;
int i; int i;
int ret;
for (i = 0; i < h->pkt.nb_nals; i++) { for (i = 0; i < h->pkt.nb_nals; i++) {
H2645NAL *nal = &h->pkt.nals[i]; H2645NAL *nal = &h->pkt.nals[i];
@ -1024,7 +1025,9 @@ static int get_last_needed_nal(H264Context *h)
case NAL_DPA: case NAL_DPA:
case NAL_IDR_SLICE: case NAL_IDR_SLICE:
case NAL_SLICE: case NAL_SLICE:
init_get_bits8(&gb, nal->data + 1, (nal->size - 1)); ret = init_get_bits8(&gb, nal->data + 1, (nal->size - 1));
if (ret < 0)
return ret;
if (!get_ue_golomb_long(&gb) || // first_mb_in_slice if (!get_ue_golomb_long(&gb) || // first_mb_in_slice
!first_slice || !first_slice ||
first_slice != nal->type) first_slice != nal->type)
@ -1076,6 +1079,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
if (avctx->active_thread_type & FF_THREAD_FRAME) if (avctx->active_thread_type & FF_THREAD_FRAME)
nals_needed = get_last_needed_nal(h); nals_needed = get_last_needed_nal(h);
if (nals_needed < 0)
return nals_needed;
for (i = 0; i < h->pkt.nb_nals; i++) { for (i = 0; i < h->pkt.nb_nals; i++) {
H2645NAL *nal = &h->pkt.nals[i]; H2645NAL *nal = &h->pkt.nals[i];