[FFmpeg-devel,4/6] avcodec/aptx: Check the number of channels

Submitted by Michael Niedermayer on Oct. 9, 2019, 10:14 a.m.

Details

Message ID 20191009101454.1608-4-michael@niedermayer.cc
State New
Headers show

Commit Message

Michael Niedermayer Oct. 9, 2019, 10:14 a.m.
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>
---
 libavcodec/aptx.c | 3 +++
 1 file changed, 3 insertions(+)

Patch hide | download patch | download mbox

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;