[FFmpeg-cvslog] avcodec/argo: Check packet size

Michael Niedermayer git at videolan.org
Wed Apr 6 21:33:59 EEST 2022


ffmpeg | branch: release/4.4 | Michael Niedermayer <michael at niedermayer.cc> | Sun Feb 27 00:59:25 2022 +0100| [310a060e77980d92e5fc2c0983d6aa7c3b84a0a7] | committer: Michael Niedermayer

avcodec/argo: Check packet size

Fixes: Timeout
Fixes: 45052/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARGO_fuzzer-6033489206575104

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 1bed27acefaab1b4c1813b8adc6468ca952a43f3)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavcodec/argo.c b/libavcodec/argo.c
index f633ec2691..8f58e682f6 100644
--- a/libavcodec/argo.c
+++ b/libavcodec/argo.c
@@ -608,6 +608,9 @@ static int decode_frame(AVCodecContext *avctx, void *data,
     uint32_t chunk;
     int ret;
 
+    if (avpkt->size < 4)
+        return AVERROR_INVALIDDATA;
+
     bytestream2_init(gb, avpkt->data, avpkt->size);
 
     if ((ret = ff_reget_buffer(avctx, frame, 0)) < 0)



More information about the ffmpeg-cvslog mailing list