[FFmpeg-cvslog] brstm: also allocate b->table in read_packet
Andreas Cadhalpun
git at videolan.org
Mon Jan 4 13:21:27 CET 2016
ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Mon Jan 4 12:53:20 2016 +0100| [bcf4ee26a0a1ed349ec7489925540401002b87cc] | committer: Andreas Cadhalpun
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 at gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bcf4ee26a0a1ed349ec7489925540401002b87cc
---
libavformat/brstm.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavformat/brstm.c b/libavformat/brstm.c
index 6ec4d89..e9d64e4 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) ||
More information about the ffmpeg-cvslog
mailing list