diff mbox series

[FFmpeg-devel,1/4] avformat/alp: Check num_channels

Message ID 20220320134739.28728-1-michael@niedermayer.cc
State Accepted
Commit 2e069f6b69475683207ea05deb269f9c532633bb
Headers show
Series [FFmpeg-devel,1/4] avformat/alp: Check num_channels | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished

Commit Message

Michael Niedermayer March 20, 2022, 1:47 p.m. UTC
Fixes: division by 0
Fixes: 45615/clusterfuzz-testcase-minimized-ffmpeg_dem_ALP_fuzzer-582660348405350
Fixes: 45625/clusterfuzz-testcase-minimized-ffmpeg_dem_ALP_fuzzer-4821437943250944

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

Comments

Michael Niedermayer March 27, 2022, 10 a.m. UTC | #1
On Sun, Mar 20, 2022 at 02:47:36PM +0100, Michael Niedermayer wrote:
> Fixes: division by 0
> Fixes: 45615/clusterfuzz-testcase-minimized-ffmpeg_dem_ALP_fuzzer-582660348405350
> Fixes: 45625/clusterfuzz-testcase-minimized-ffmpeg_dem_ALP_fuzzer-4821437943250944
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/alp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply patchset

[...]
diff mbox series

Patch

diff --git a/libavformat/alp.c b/libavformat/alp.c
index f2428a9e3b..40e4890a38 100644
--- a/libavformat/alp.c
+++ b/libavformat/alp.c
@@ -122,7 +122,7 @@  static int alp_read_header(AVFormatContext *s)
     par->format                 = AV_SAMPLE_FMT_S16;
     par->sample_rate            = hdr->sample_rate;
 
-    if (hdr->num_channels > 2)
+    if (hdr->num_channels > 2 || hdr->num_channels == 0)
         return AVERROR_INVALIDDATA;
 
     av_channel_layout_default(&par->ch_layout, hdr->num_channels);