summaryrefslogtreecommitdiff
path: root/libavcodec/aacdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-09-08 21:08:31 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-09-24 17:53:39 +0200
commit3dce4d03d5a555bff2e11f97fb54701b22effeaf (patch)
tree12df1b9a5dd77bdc9e93cebba708ed27a2f46fa7 /libavcodec/aacdec.c
parent1e984a69155c8b49d6fd4cd0a052d62da42d59a6 (diff)
downloadffmpeg-3dce4d03d5a555bff2e11f97fb54701b22effeaf.tar.gz
avcodec/aacdec: Check if we run out of input in read_stream_mux_config()
Fixes: Infinite loop Fixes: 16920/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_LATM_fuzzer-5653421289373696 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/aacdec.c')
-rw-r--r--libavcodec/aacdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 98b6e58be3..d17852d8ba 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -409,6 +409,8 @@ static int read_stream_mux_config(struct LATMContext *latmctx,
} else {
int esc;
do {
+ if (get_bits_left(gb) < 9)
+ return AVERROR_INVALIDDATA;
esc = get_bits(gb, 1);
skip_bits(gb, 8);
} while (esc);