brstm: also allocate b->table in read_packet
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Mon, 4 Jan 2016 11:53:20 +0000 (12:53 +0100)
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Thu, 28 Jan 2016 00:05:04 +0000 (01:05 +0100)
This fixes NULL pointer dereferencing if the codec is forced to
adpcm_thp even though a different one was detected.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit bcf4ee26a0a1ed349ec7489925540401002b87cc)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
libavformat/brstm.c

index 9228fa7..aba3770 100644 (file)
@@ -263,6 +263,10 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
         if (!b->adpc) {
             av_log(s, AV_LOG_ERROR, "adpcm_thp requires ADPC chunk, but none was found.\n");
             return AVERROR_INVALIDDATA;
+        if (!b->table) {
+            b->table = av_mallocz(32 * codec->channels);
+            if (!b->table)
+                return AVERROR(ENOMEM);
         }
 
         if (av_new_packet(pkt, 8 + (32 + 4) * codec->channels + size) < 0)