[FFmpeg-devel] [PATCH 3/3] avcodec/agm: Check that there is available input in read_code()

Michael Niedermayer michael at niedermayer.cc
Sun Apr 7 02:21:14 EEST 2019


Fixes: Timeout (46sec -> 7ms)
Fixes: 14030/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5721258760601600

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavcodec/agm.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/agm.c b/libavcodec/agm.c
index cbd45e8095..965be123f4 100644
--- a/libavcodec/agm.c
+++ b/libavcodec/agm.c
@@ -88,6 +88,9 @@ static int read_code(GetBitContext *gb, int *oskip, int *level, int *map, int mo
 {
     int len = 0, skip = 0, max;
 
+    if (get_bits_left(gb) < 2)
+        return AVERROR_INVALIDDATA;
+
     if (show_bits(gb, 2)) {
         switch (show_bits(gb, 4)) {
         case 1:
-- 
2.21.0



More information about the ffmpeg-devel mailing list