[FFmpeg-cvslog] avcodec/arbc: Skip tiles in fill_tileX() which are completely outside

Michael Niedermayer git at videolan.org
Tue Jun 4 14:20:23 EEST 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu May  9 23:49:41 2019 +0200| [cdd886a286fb7d55a7d525ec479b49284b7f8b44] | committer: Michael Niedermayer

avcodec/arbc: Skip tiles in fill_tileX() which are completely outside

Fixes: signed integer overflow: 2052526848 + 147237888 cannot be represented in type 'int'
Fixes: 14441/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARBC_fuzzer-5717632944177152
Fixes: 14453/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARBC_fuzzer-5739679254577152

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cdd886a286fb7d55a7d525ec479b49284b7f8b44
---

 libavcodec/arbc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/arbc.c b/libavcodec/arbc.c
index bce4a4c96d..06970f140b 100644
--- a/libavcodec/arbc.c
+++ b/libavcodec/arbc.c
@@ -94,6 +94,9 @@ static int fill_tileX(AVCodecContext *avctx, int tile_width, int tile_height,
         int start_y = y * tile_height, start_x = x * tile_width;
         int end_y = start_y + tile_height, end_x = start_x + tile_width;
 
+        if (start_x >= avctx->width || start_y >= avctx->height)
+            continue;
+
         for (int j = start_y; j < end_y; j += step_h) {
             for (int k = start_x; k < end_x; k += step_w) {
                 if (mask & 0x8000U) {



More information about the ffmpeg-cvslog mailing list