aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-04-05 22:58:29 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-05-10 01:09:13 +0200
commit5501bb28ddfa6441dcbf8ea0a964a13aa33f66fe (patch)
tree2847f157b5beb3eece3a2b87541b35e29d1e1337 /libavcodec
parent81fe316ad9852a3dfe46b4dc919ed1709b217671 (diff)
downloadffmpeg-5501bb28ddfa6441dcbf8ea0a964a13aa33f66fe.tar.gz
avcodec/g2meet: Check tile_width in epic_jb_decode_tile()
Fixes: out of array access Fixes: 21469/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-5199357982015488 Alternatively the arrays can be made bigger or the index can be clipped. In case a real file with such huge tiles exist we ask the user to upload it. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/g2meet.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 731d29a5d4..7ef275c9fe 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -917,6 +917,11 @@ static int epic_jb_decode_tile(G2MContext *c, int tile_x, int tile_y,
awidth = FFALIGN(tile_width, 16);
aheight = FFALIGN(tile_height, 16);
+ if (tile_width > (1 << FF_ARRAY_ELEMS(c->ec.prev_row_rung))) {
+ avpriv_request_sample(avctx, "large tile width");
+ return AVERROR_INVALIDDATA;
+ }
+
if (els_dsize) {
int ret, i, j, k;
uint8_t tr_r, tr_g, tr_b, *buf;