diff mbox series

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

Message ID 20220227102606.5717-1-michael@niedermayer.cc
State Accepted
Commit 1bed27acefaab1b4c1813b8adc6468ca952a43f3
Headers show
Series [FFmpeg-devel] avcodec/argo: Check packet size | expand

Checks

Context Check Description
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Michael Niedermayer Feb. 27, 2022, 10:26 a.m. UTC 
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@niedermayer.cc>
---
 libavcodec/argo.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Michael Niedermayer March 7, 2022, 11:31 p.m. UTC | #1 
On Sun, Feb 27, 2022 at 11:26:06AM +0100, Michael Niedermayer wrote:
> 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@niedermayer.cc>
> ---
>  libavcodec/argo.c | 3 +++
>  1 file changed, 3 insertions(+)

will apply

[...]
diff mbox series

Patch

diff --git a/libavcodec/argo.c b/libavcodec/argo.c
index 66f3d96480..58cc9984bc 100644
--- a/libavcodec/argo.c
+++ b/libavcodec/argo.c
@@ -607,6 +607,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)