aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-08-20 16:52:07 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-08-21 01:21:27 +0200
commitf51e4d026cc762ff2d47d6107658dbff42ba5ea8 (patch)
treeb0e3d94a3ab583dc8c7970a86d42400a32c8cac3
parent74e6800381a2c82fff0aef6457414b3cefc1157c (diff)
downloadffmpeg-f51e4d026cc762ff2d47d6107658dbff42ba5ea8.tar.gz
avcodec/alsdec: Limit maximum channels to 512
There seems to be no limit in the specification and upto 64k could be stored 512 is choosen as limit as thats the maximum in a conformance sample An alternative to this patch would be a max_channels variable Fixes: OOM Fixes: 16200/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALS_fuzzer-5764788793114624 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Suggested-by: Thilo Borgmann <thilo.borgmann@mail.de> Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/alsdec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 26c496c769..1fdd0cb0fe 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -348,6 +348,11 @@ static av_cold int read_specific_config(ALSDecContext *ctx)
if (als_id != MKBETAG('A','L','S','\0'))
return AVERROR_INVALIDDATA;
+ if (avctx->channels > FF_SANE_NB_CHANNELS) {
+ avpriv_request_sample(avctx, "Huge number of channels\n");
+ return AVERROR_PATCHWELCOME;
+ }
+
ctx->cur_frame_length = sconf->frame_length;
// read channel config