diff mbox series

[FFmpeg-devel] avcodec/dsddec: Check channels

Message ID 20200504201000.30637-1-michael@niedermayer.cc
State Accepted
Commit 2570a8777e7095358b10f679d35641e114a2ab33
Headers show
Series [FFmpeg-devel] avcodec/dsddec: Check channels | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Michael Niedermayer May 4, 2020, 8:10 p.m. UTC 
Fixes: division by zero
Fixes: 21677/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DSD_MSBF_fuzzer-5712547983654912

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

Comments

Michael Niedermayer May 21, 2020, 10:14 a.m. UTC | #1 
On Mon, May 04, 2020 at 10:10:00PM +0200, Michael Niedermayer wrote:
> Fixes: division by zero
> Fixes: 21677/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DSD_MSBF_fuzzer-5712547983654912
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/dsddec.c | 3 +++
>  1 file changed, 3 insertions(+)

will apply

[...]
diff mbox series

Patch

diff --git a/libavcodec/dsddec.c b/libavcodec/dsddec.c
index 7c3ae15768..39837a5ad9 100644
--- a/libavcodec/dsddec.c
+++ b/libavcodec/dsddec.c
@@ -44,6 +44,9 @@  static av_cold int decode_init(AVCodecContext *avctx)
     int i;
     uint8_t silence;
 
+    if (!avctx->channels)
+        return AVERROR_INVALIDDATA;
+
     ff_init_dsd_data();
 
     s = av_malloc_array(sizeof(DSDContext), avctx->channels);