mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
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>
(cherry picked from commit 5501bb28dd
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
189d849aa5
commit
e060f917f2
@ -916,6 +916,11 @@ static int epic_jb_decode_tile(G2MContext *c, int tile_x, int tile_y,
|
|||||||
awidth = FFALIGN(tile_width, 16);
|
awidth = FFALIGN(tile_width, 16);
|
||||||
aheight = FFALIGN(tile_height, 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) {
|
if (els_dsize) {
|
||||||
int ret, i, j, k;
|
int ret, i, j, k;
|
||||||
uint8_t tr_r, tr_g, tr_b, *buf;
|
uint8_t tr_r, tr_g, tr_b, *buf;
|
||||||
|
Loading…
Reference in New Issue
Block a user