You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-07-11 14:30:22 +02:00
avcodec/exr: Check limits to avoid overflow in delta computation
Fixes: signed integer overflow: 553590816 - -2145378049 cannot be represented in type 'int'
Fixes: 26315/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5938755121446912
Fixes: 26340/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5644316208529408
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6910e0f4e5
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
@ -1520,15 +1520,27 @@ static int decode_header(EXRContext *s, AVFrame *frame)
|
|||||||
continue;
|
continue;
|
||||||
} else if ((var_size = check_header_variable(s, "dataWindow", "box2i",
|
} else if ((var_size = check_header_variable(s, "dataWindow", "box2i",
|
||||||
31)) >= 0) {
|
31)) >= 0) {
|
||||||
|
int xmin, ymin, xmax, ymax;
|
||||||
if (!var_size) {
|
if (!var_size) {
|
||||||
ret = AVERROR_INVALIDDATA;
|
ret = AVERROR_INVALIDDATA;
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
s->xmin = bytestream2_get_le32(&s->gb);
|
xmin = bytestream2_get_le32(&s->gb);
|
||||||
s->ymin = bytestream2_get_le32(&s->gb);
|
ymin = bytestream2_get_le32(&s->gb);
|
||||||
s->xmax = bytestream2_get_le32(&s->gb);
|
xmax = bytestream2_get_le32(&s->gb);
|
||||||
s->ymax = bytestream2_get_le32(&s->gb);
|
ymax = bytestream2_get_le32(&s->gb);
|
||||||
|
|
||||||
|
if (xmin > xmax || ymin > ymax ||
|
||||||
|
(unsigned)xmax - xmin >= INT_MAX ||
|
||||||
|
(unsigned)ymax - ymin >= INT_MAX) {
|
||||||
|
ret = AVERROR_INVALIDDATA;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
s->xmin = xmin;
|
||||||
|
s->xmax = xmax;
|
||||||
|
s->ymin = ymin;
|
||||||
|
s->ymax = ymax;
|
||||||
s->xdelta = (s->xmax - s->xmin) + 1;
|
s->xdelta = (s->xmax - s->xmin) + 1;
|
||||||
s->ydelta = (s->ymax - s->ymin) + 1;
|
s->ydelta = (s->ymax - s->ymin) + 1;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user