Fixes: Timeout Fixes: 12967/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARBC_fuzzer-5639021454163968
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> --- libavcodec/arbc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/arbc.c b/libavcodec/arbc.c index 4558304f12..841a9f10ac 100644 --- a/libavcodec/arbc.c +++ b/libavcodec/arbc.c @@ -45,6 +45,9 @@ static void fill_tile4(AVCodecContext *avctx, uint8_t *color, AVFrame *frame) int nb_tiles = bytestream2_get_le16(gb); int h = avctx->height - 1; + if ((avctx->width / 4 + 1) * (avctx->height / 4 + 1) < nb_tiles) + return; + for (int i = 0; i < nb_tiles; i++) { int y = bytestream2_get_byte(gb); int x = bytestream2_get_byte(gb); @@ -79,6 +82,9 @@ static void fill_tileX(AVCodecContext *avctx, int tile_width, int tile_height, int nb_tiles = bytestream2_get_le16(gb); int h = avctx->height - 1; + if ((avctx->width / tile_width + 1) * (avctx->height / tile_height + 1) < nb_tiles) + return; + for (int i = 0; i < nb_tiles; i++) { int y = bytestream2_get_byte(gb); int x = bytestream2_get_byte(gb); -- 2.20.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
