Fixes: 736/clusterfuzz-testcase-5580263943831552
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavcodec/mpeg4videodec.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 128469d755..791a07bbbb 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -387,11 +387,21 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext
*ctx, GetBitContext *g
}
for (i = 0; i < 2; i++) {
+ int64_t sd[2] = {
+ s->sprite_delta[i][0] - a * (1LL<<16),
+ s->sprite_delta[i][1] - a * (1LL<<16)
+ };
+
if (llabs(s->sprite_offset[0][i] + s->sprite_delta[i][0] *
(w+16LL)) >= INT_MAX ||
llabs(s->sprite_offset[0][i] + s->sprite_delta[i][1] *
(h+16LL)) >= INT_MAX ||
llabs(s->sprite_offset[0][i] + s->sprite_delta[i][0] *
(w+16LL) + s->sprite_delta[i][1] * (h+16LL)) >= INT_MAX ||
llabs(s->sprite_delta[i][0] * (w+16LL)) >= INT_MAX ||
- llabs(s->sprite_delta[i][1] * (w+16LL)) >= INT_MAX
+ llabs(s->sprite_delta[i][1] * (w+16LL)) >= INT_MAX ||
+ llabs(sd[0]) >= INT_MAX ||
+ llabs(sd[1]) >= INT_MAX ||
+ llabs(s->sprite_offset[0][i] + sd[0] * (w+16LL)) >= INT_MAX ||
+ llabs(s->sprite_offset[0][i] + sd[1] * (h+16LL)) >= INT_MAX ||
+ llabs(s->sprite_offset[0][i] + sd[0] * (w+16LL) + sd[1] *
(h+16LL)) >= INT_MAX
) {
avpriv_request_sample(s->avctx, "Overflow on sprite points");
goto overflow;
--
2.11.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
