diff mbox series

[FFmpeg-devel,1/4] avcodec/utils: ARGO writes 4x4 blocks without regard to the image dimensions

Message ID 20210903183913.15255-1-michael@niedermayer.cc
State Accepted
Commit 018b611b4ba74a5cecfb8a75a637b49840e7c320
Headers show
Series [FFmpeg-devel,1/4] avcodec/utils: ARGO writes 4x4 blocks without regard to the image dimensions | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Michael Niedermayer Sept. 3, 2021, 6:39 p.m. UTC 
Fixes: out of array access
Fixes: 37197/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARGO_fuzzer-5877046382297088

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/utils.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Michael Niedermayer Sept. 26, 2021, 3:25 p.m. UTC | #1 
On Fri, Sep 03, 2021 at 08:39:10PM +0200, Michael Niedermayer wrote:
> Fixes: out of array access
> Fixes: 37197/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARGO_fuzzer-5877046382297088
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/utils.c | 6 ++++++
>  1 file changed, 6 insertions(+)

will apply

[...]
diff mbox series

Patch

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index cfc07cbcb8..4f9601b12d 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -298,6 +298,12 @@  void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
             h_align = 4;
         }
         break;
+    case AV_PIX_FMT_BGR0:
+        if (s->codec_id == AV_CODEC_ID_ARGO) {
+            w_align = 4;
+            h_align = 4;
+        }
+        break;
     default:
         break;
     }