[FFmpeg-devel] [PATCH 2/4] avcodec/cbs_vp8: Do not use assert to check for end

Michael Niedermayer michael at niedermayer.cc
Sat Dec 16 14:16:17 EET 2023


Fixes: abort()
Fixes: 64232/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5417957987319808

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/cbs_vp8.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/cbs_vp8.c b/libavcodec/cbs_vp8.c
index 01d4b9cefef..b76cde98517 100644
--- a/libavcodec/cbs_vp8.c
+++ b/libavcodec/cbs_vp8.c
@@ -329,7 +329,9 @@ static int cbs_vp8_read_unit(CodedBitstreamContext *ctx,
 
     pos = get_bits_count(&gbc);
     pos /= 8;
-    av_assert0(pos <= unit->data_size);
+
+    if (pos > unit->data_size)
+        return AVERROR_INVALIDDATA;
 
     frame->data_ref = av_buffer_ref(unit->data_ref);
     if (!frame->data_ref)
-- 
2.17.1



More information about the ffmpeg-devel mailing list