[FFmpeg-devel] [PATCH 1/4] avcodec/wmaprodec: Check if the channel sum of all internal contexts match the external

Michael Niedermayer michael at niedermayer.cc
Wed Nov 13 00:51:30 EET 2019


Fixes: NULL pointer dereference
Fixes: 18689/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XMA1_fuzzer-5715114640015360

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavcodec/wmaprodec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index e001dd6e4e..070bb32af8 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -1930,6 +1930,8 @@ static av_cold int xma_decode_init(AVCodecContext *avctx)
         s->start_channel[i] = start_channels;
         start_channels += s->xma[i].nb_channels;
     }
+    if (start_channels != avctx->channels)
+        return AVERROR_INVALIDDATA;
 
     return ret;
 }
-- 
2.23.0



More information about the ffmpeg-devel mailing list