diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-02-18 00:40:34 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-02-25 20:03:24 +0300 |
| commit | 160851bceed719c45459c64ab62b8e5bc130e2ee (patch) | |
| tree | 1872ddd82a4f049f056b450a3d550174bdbfbd84 | |
| parent | cdf17cf92b0f9c02951b7ea25d6a150000282bdf (diff) | |
avcodec/arbc: Check nb_tiles against dimensions
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 <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/arbc.c | 6 |
1 files changed, 6 insertions, 0 deletions
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); |