diff mbox

[FFmpeg-devel,1/2] avcodec/cdgraphics: Use ff_set_dimensions()

Message ID 20190305193818.8289-1-michael@niedermayer.cc
State Accepted
Commit 9a9f0e239c1c6f5c96cc90ba673087f86ca1eabc
Headers show

Commit Message

Michael Niedermayer March 5, 2019, 7:38 p.m. UTC
Fixes: Timeout (17 sec -> 65 milli sec)
Fixes: 13264/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CDGRAPHICS_fuzzer-5711167941509120

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

Comments

Michael Niedermayer March 14, 2019, 1:30 p.m. UTC | #1
On Tue, Mar 05, 2019 at 08:38:17PM +0100, Michael Niedermayer wrote:
> Fixes: Timeout (17 sec -> 65 milli sec)
> Fixes: 13264/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CDGRAPHICS_fuzzer-5711167941509120
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/cdgraphics.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)

will apply patchset

[...]
diff mbox

Patch

diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c
index be85e54288..cf3f01a417 100644
--- a/libavcodec/cdgraphics.c
+++ b/libavcodec/cdgraphics.c
@@ -81,11 +81,8 @@  static av_cold int cdg_decode_init(AVCodecContext *avctx)
         return AVERROR(ENOMEM);
     cc->transparency = -1;
 
-    avctx->width   = CDG_FULL_WIDTH;
-    avctx->height  = CDG_FULL_HEIGHT;
     avctx->pix_fmt = AV_PIX_FMT_PAL8;
-
-    return 0;
+    return ff_set_dimensions(avctx, CDG_FULL_WIDTH, CDG_FULL_HEIGHT);
 }
 
 static void cdg_border_preset(CDGraphicsContext *cc, uint8_t *data)