[FFmpeg-cvslog] mpeg4audio: check the init_get_bits() return value

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Jan  1 17:56:56 2015 +0100| [7e4e010b80e76862e83afbd41c25d50e72f0b44c] | committer: Anton Khirnov

mpeg4audio: check the init_get_bits() return value

Fixes possible invalid reads.

CC:libav-stable at libav.org

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e4e010b80e76862e83afbd41c25d50e72f0b44c
---

 libavcodec/mpeg4audio.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c
index 0fb9b96..2363cb6 100644
--- a/libavcodec/mpeg4audio.c
+++ b/libavcodec/mpeg4audio.c
@@ -80,9 +80,11 @@ int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf,
                                  int bit_size, int sync_extension)
 {
     GetBitContext gb;
-    int specific_config_bitindex;
+    int specific_config_bitindex, ret;
 
-    init_get_bits(&gb, buf, bit_size);
+    ret = init_get_bits(&gb, buf, bit_size);
+    if (ret < 0)
+        return ret;
     c->object_type = get_object_type(&gb);
     c->sample_rate = get_sample_rate(&gb, &c->sampling_index);
     c->chan_config = get_bits(&gb, 4);