summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-02-11 22:44:36 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-03-28 14:20:00 +0200
commit2c477be08a64a78ab0a358ae00e2f2dc746f2b47 (patch)
treeac77bc8cea7ab11b031d6ff2cb230f849c90c2d3
parentb5d8fe1c874947ca67ee8117b18f8052f0e590fc (diff)
avformat/jacosubdec: Use 64bit intermediate for start/end timestamp shift
Fixes: signed integer overflow: -1957694447 + -1620425806 cannot be represented in type 'int' Fixes: 30207/clusterfuzz-testcase-minimized-ffmpeg_dem_JACOSUB_fuzzer-5050791771635712 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/jacosubdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c
index 828c33057f..9c6640eef8 100644
--- a/libavformat/jacosubdec.c
+++ b/libavformat/jacosubdec.c
@@ -125,8 +125,8 @@ static const char *read_ts(JACOsubContext *jacosub, const char *buf,
return NULL;
shift_and_ret:
- ts_start64 = (ts_start + jacosub->shift) * 100LL / jacosub->timeres;
- ts_end64 = (ts_end + jacosub->shift) * 100LL / jacosub->timeres;
+ ts_start64 = (ts_start + (int64_t)jacosub->shift) * 100LL / jacosub->timeres;
+ ts_end64 = (ts_end + (int64_t)jacosub->shift) * 100LL / jacosub->timeres;
*start = ts_start64;
*duration = ts_end64 - ts_start64;
return buf + len;