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

aacdec: check init_get_bits return

Browse Source 
Also fixes an integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-27 22:44:29 +01:00
parent 8888c72fcf
commit 73abc3a634
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/aacdec.c
View File

@ -774,13 +774,15 @@ static int decode_audio_specific_config(AACContext *ac,
{ {
GetBitContext gb; GetBitContext gb;
int i; int i;
int ret;
av_dlog(avctx, "audio specific config size %d\n", bit_size >> 3); av_dlog(avctx, "audio specific config size %d\n", bit_size >> 3);
for (i = 0; i < bit_size >> 3; i++) for (i = 0; i < bit_size >> 3; i++)
av_dlog(avctx, "%02x ", data[i]); av_dlog(avctx, "%02x ", data[i]);
av_dlog(avctx, "\n"); av_dlog(avctx, "\n");
init_get_bits(&gb, data, bit_size); if ((ret = init_get_bits(&gb, data, bit_size)) < 0)
return ret;
if ((i = avpriv_mpeg4audio_get_config(m4ac, data, bit_size, sync_extension)) < 0) if ((i = avpriv_mpeg4audio_get_config(m4ac, data, bit_size, sync_extension)) < 0)
return -1; return -1;
@ -2922,7 +2924,8 @@ static int latm_decode_frame(AVCodecContext *avctx, void *out,
int muxlength, err; int muxlength, err;
GetBitContext gb; GetBitContext gb;
init_get_bits(&gb, avpkt->data, avpkt->size * 8); if ((err = init_get_bits8(&gb, avpkt->data, avpkt->size)) < 0)
return err;
// check for LOAS sync word // check for LOAS sync word
if (get_bits(&gb, 11) != LOAS_SYNC_WORD) if (get_bits(&gb, 11) != LOAS_SYNC_WORD)