Browse Source

avpriv_mpeg4audio_get_config: check init_get_bits() return code.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.2
Michael Niedermayer 12 years ago
parent
commit
deefdf9788
1 changed files with 1 additions and 3 deletions
  1. +1
    -3
      libavcodec/mpeg4audio.c

+ 1
- 3
libavcodec/mpeg4audio.c View File

@@ -84,10 +84,8 @@ int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf,
GetBitContext gb;
int specific_config_bitindex;

if(bit_size<=0)
if (bit_size <= 0 || init_get_bits(&gb, buf, bit_size) < 0)
return AVERROR_INVALIDDATA;

init_get_bits(&gb, buf, bit_size);
c->object_type = get_object_type(&gb);
c->sample_rate = get_sample_rate(&gb, &c->sampling_index);
c->chan_config = get_bits(&gb, 4);


Loading…
Cancel
Save