From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 17 Dec 2011 04:02:11 +0000 (+0100)
Subject: aacdec: Fix null pointer crash
X-Git-Tag: android-x86-4.4-r1~14388
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f37b2d5a6884c7bea87a6c7454239381449bd637;p=android-x86%2Fexternal-ffmpeg.git

aacdec: Fix null pointer crash
Fixes bug170
Bug found by: Gautam Gupta

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c
index 67445935c4..abd3fa4a9b 100644
--- a/libavcodec/mpeg4audio.c
+++ b/libavcodec/mpeg4audio.c
@@ -82,6 +82,9 @@ int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf,
     GetBitContext gb;
     int specific_config_bitindex;
 
+    if(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);