Browse Source

brstm: also allocate b->table in read_packet

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>
tags/n3.0
Andreas Cadhalpun 9 years ago
parent
commit
bcf4ee26a0
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      libavformat/brstm.c

+ 4
- 0
libavformat/brstm.c View File

@@ -392,6 +392,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 (size > (INT_MAX - 32 - 4) ||


Loading…
Cancel
Save