brstm: make sure an ADPC chunk was read for adpcm_thp
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Mon, 4 Jan 2016 11:57:38 +0000 (12:57 +0100)
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Thu, 28 Jan 2016 00:05:04 +0000 (01:05 +0100)
This fixes NULL pointer dereferencing.

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

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