diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-01-04 12:53:20 +0100 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-01-04 13:20:09 +0100 |
| commit | bcf4ee26a0a1ed349ec7489925540401002b87cc (patch) | |
| tree | b5e195a9a34de987fb25e58717fe0f2095855c8e /libavformat | |
| parent | d7d37c479fa71639650751648275615e979beb33 (diff) | |
| download | ffmpeg-bcf4ee26a0a1ed349ec7489925540401002b87cc.tar.gz | |
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>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/brstm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/brstm.c b/libavformat/brstm.c index 6ec4d89438..e9d64e4ba8 100644 --- a/libavformat/brstm.c +++ b/libavformat/brstm.c @@ -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) || |