aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-10-09 09:53:26 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-11-11 20:18:48 +0100
commita0b57ca1b89af7f52c8f92dfe5a20195ddf3d54b (patch)
tree26d9d13944f12676a1038e587b9bdf4a99e6f199
parent73254b0558f1053f046b56c423f5d841ba604db0 (diff)
downloadffmpeg-a0b57ca1b89af7f52c8f92dfe5a20195ddf3d54b.tar.gz
avcodec/aptx: Check the number of channels
Fixes: store to null pointer of type 'uint32_t' (aka 'unsigned int') Fixes: 18021/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APTX_HD_fuzzer-5761738313564160 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 98a257c3235bdc18151534134148845728418248) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/aptx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/aptx.c b/libavcodec/aptx.c
index e3fb064a6d..a2620a9212 100644
--- a/libavcodec/aptx.c
+++ b/libavcodec/aptx.c
@@ -989,6 +989,9 @@ static av_cold int aptx_init(AVCodecContext *avctx)
AptXContext *s = avctx->priv_data;
int chan, subband;
+ if (avctx->channels != 2)
+ return AVERROR_INVALIDDATA;
+
s->hd = avctx->codec->id == AV_CODEC_ID_APTX_HD;
s->block_size = s->hd ? 6 : 4;