[FFmpeg-cvslog] avcodec/cbs_av1: Check leb128 values read

Michael Niedermayer git at videolan.org
Sat Jan 18 19:59:53 EET 2020


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Dec 12 23:50:27 2019 +0100| [a70d8363648fdd380df7f2ed39eaccf08d406e6a] | committer: Michael Niedermayer

avcodec/cbs_av1: Check leb128 values read

"It is a requirement of bitstream conformance that the value returned from the leb128 parsing process is less than or equal
to (1 << 32) - 1."

Fixes: assertion failure
Fixes: 19293/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5749508361420800

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a70d8363648fdd380df7f2ed39eaccf08d406e6a
---

 libavcodec/cbs_av1.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
index ab006f4d11..16eb7143b6 100644
--- a/libavcodec/cbs_av1.c
+++ b/libavcodec/cbs_av1.c
@@ -170,6 +170,9 @@ static int cbs_av1_read_leb128(CodedBitstreamContext *ctx, GetBitContext *gbc,
             break;
     }
 
+    if (value > UINT32_MAX)
+        return AVERROR_INVALIDDATA;
+
     if (ctx->trace_enable)
         ff_cbs_trace_syntax_element(ctx, position, name, NULL, "", value);
 



More information about the ffmpeg-cvslog mailing list