diff mbox

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

Message ID 20191112225133.21312-1-michael@niedermayer.cc
State Accepted
Commit 090ac5799751c6f52358da4e5201a3845760db93
Headers show

Commit Message

Michael Niedermayer Nov. 12, 2019, 10:51 p.m. UTC 
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@niedermayer.cc>
---
 libavcodec/wmaprodec.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Michael Niedermayer Dec. 9, 2019, 10:30 p.m. UTC | #1 
On Tue, Nov 12, 2019 at 11:51:30PM +0100, Michael Niedermayer wrote:
> 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@niedermayer.cc>
> ---
>  libavcodec/wmaprodec.c | 2 ++
>  1 file changed, 2 insertions(+)

will apply patchset

[...]
diff mbox

Patch

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;
 }