virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

h263dec: use init_get_bits8() and check its return code

Browse Source 
Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-21 23:32:56 +02:00
parent 7e3e653618
commit d47e14b53a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/h263dec.c
View File

@ -407,10 +407,12 @@ retry:
} }
if(s->bitstream_buffer_size && (s->divx_packed || buf_size<20)){ //divx 5.01+/xvid frame reorder if(s->bitstream_buffer_size && (s->divx_packed || buf_size<20)){ //divx 5.01+/xvid frame reorder
init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size*8); ret = init_get_bits8(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size);
}else }else
init_get_bits(&s->gb, buf, buf_size*8); ret = init_get_bits8(&s->gb, buf, buf_size);
s->bitstream_buffer_size=0; s->bitstream_buffer_size=0;
if (ret < 0)
return ret;
if (!s->context_initialized) { if (!s->context_initialized) {
if ((ret = ff_MPV_common_init(s)) < 0) //we need the idct permutaton for reading a custom matrix if ((ret = ff_MPV_common_init(s)) < 0) //we need the idct permutaton for reading a custom matrix
@ -435,8 +437,8 @@ retry:
if(s->avctx->extradata_size && s->picture_number==0){ if(s->avctx->extradata_size && s->picture_number==0){
GetBitContext gb; GetBitContext gb;
init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size*8); if (init_get_bits8(&gb, s->avctx->extradata, s->avctx->extradata_size) >= 0 )
ret = ff_mpeg4_decode_picture_header(s, &gb); ret = ff_mpeg4_decode_picture_header(s, &gb);
} }
ret = ff_mpeg4_decode_picture_header(s, &s->gb); ret = ff_mpeg4_decode_picture_header(s, &s->gb);
} else if (CONFIG_H263I_DECODER && s->codec_id == AV_CODEC_ID_H263I) { } else if (CONFIG_H263I_DECODER && s->codec_id == AV_CODEC_ID_H263I) {