[FFmpeg-cvslog] avformat/jacosubdec: Fix overflow in get_shift()
Michael Niedermayer
git at videolan.org
Fri Nov 4 12:04:49 EET 2022
ffmpeg | branch: release/5.0 | Michael Niedermayer <michael at niedermayer.cc> | Sat Sep 17 22:55:24 2022 +0200| [b8d29eab19f8a8bd82ec96f88dcef13a87b3d024] | committer: Michael Niedermayer
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 at niedermayer.cc>
(cherry picked from commit b1a68127bbcd3d638363fa0249982c494e87c9e2)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b8d29eab19f8a8bd82ec96f88dcef13a87b3d024
---
libavformat/jacosubdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
More information about the ffmpeg-cvslog
mailing list