summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-09-17 22:55:24 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-11-03 23:29:51 +0100
commitb8d29eab19f8a8bd82ec96f88dcef13a87b3d024 (patch)
tree3c18a317043fba42a513880fbd64a26535f7ed16
parent622893afe30bdd81bbe62f505fbef6a05a5e6d57 (diff)
downloadffmpeg-b8d29eab19f8a8bd82ec96f88dcef13a87b3d024.tar.gz
avformat/jacosubdec: Fix overflow in get_shift()
Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_JACOSUB_fuzzer-6722544461283328 Fixes: signed integer overflow: 48214448 * 60 cannot be represented in type 'int' 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 b1a68127bbcd3d638363fa0249982c494e87c9e2) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/jacosubdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c
index 68ed7511d7..a4b6c0fe40 100644
--- a/libavformat/jacosubdec.c
+++ b/libavformat/jacosubdec.c
@@ -145,7 +145,7 @@ static int get_shift(int timeres, const char *buf)
ret = 0;
switch (n) {
case 4:
- ret = sign * (((int64_t)a*3600 + b*60 + c) * timeres + d);
+ ret = sign * (((int64_t)a*3600 + (int64_t)b*60 + c) * timeres + d);
break;
case 3:
ret = sign * (( (int64_t)a*60 + b) * timeres + c);