[FFmpeg-devel] [PATCH 2/2] brstm: also allocate b->table in read_packet

Andreas Cadhalpun andreas.cadhalpun at googlemail.com
Mon Jan 4 13:11:24 CET 2016


This fixes NULL pointer dereferencing if the codec is forced to
adpcm_thp even though a different one was detected.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
---
 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) ||
-- 
2.6.4



More information about the ffmpeg-devel mailing list