From bcf4ee26a0a1ed349ec7489925540401002b87cc Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Mon, 4 Jan 2016 12:53:20 +0100 Subject: 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 Signed-off-by: Andreas Cadhalpun --- libavformat/brstm.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavformat/brstm.c') 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) || -- cgit v1.2.3