diff mbox series

[FFmpeg-devel,3/3] avcodec/argo: Check for even dimensions

Message ID 20210731174844.16646-3-michael@niedermayer.cc
State Accepted
Commit c2f5e9ff3c8141fe6a2c08f3cc4e46e17b96cbb4
Headers show
Series [FFmpeg-devel,1/3] avcodec/sbrdsp_fixed: Fix negation overflow in sbr_neg_odd_64_c() | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Michael Niedermayer July 31, 2021, 5:48 p.m. UTC 
Fixes: reading over the end
Fixes: 36346/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARGO_fuzzer-5366943107383296

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 | 5 +++++
 1 file changed, 5 insertions(+)
diff mbox series

Patch

diff --git a/libavcodec/argo.c b/libavcodec/argo.c
index bbdb6ae15f..df9aab92a8 100644
--- a/libavcodec/argo.c
+++ b/libavcodec/argo.c
@@ -684,6 +684,11 @@  static av_cold int decode_init(AVCodecContext *avctx)
              return AVERROR_PATCHWELCOME;
     }
 
+    if (avctx->width % 2 || avctx->height % 2) {
+        avpriv_request_sample(s, "Odd dimensions\n");
+        return AVERROR_PATCHWELCOME;
+    }
+
     s->frame = av_frame_alloc();
     if (!s->frame)
         return AVERROR(ENOMEM);