diff mbox series

[FFmpeg-devel,2/4] avutil/avsscanf: Add () to avoid integer overflow in scanexp()

Message ID 20200618122026.24534-2-michael@niedermayer.cc
State Accepted
Commit 42b28565aa852b98d95d8d02f7b0781999f9d533
Headers show
Series [FFmpeg-devel,1/4] avcodec/mv30: Fix integer overflows in idct2_1d() | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Michael Niedermayer June 18, 2020, 12:20 p.m. UTC
Fixes: signed integer overflow: 2147483610 + 52 cannot be represented in type 'int'
Fixes: 23260/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PBM_fuzzer-5187871274434560

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavutil/avsscanf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Niedermayer July 1, 2020, 9:42 a.m. UTC | #1
On Thu, Jun 18, 2020 at 02:20:24PM +0200, Michael Niedermayer wrote:
> Fixes: signed integer overflow: 2147483610 + 52 cannot be represented in type 'int'
> Fixes: 23260/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PBM_fuzzer-5187871274434560
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavutil/avsscanf.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

will apply

[...]
diff mbox series

Patch

diff --git a/libavutil/avsscanf.c b/libavutil/avsscanf.c
index 1c85412fd4..850c117940 100644
--- a/libavutil/avsscanf.c
+++ b/libavutil/avsscanf.c
@@ -229,9 +229,9 @@  static long long scanexp(FFFILE *f, int pok)
         return LLONG_MIN;
     }
     for (x=0; c-'0'<10U && x<INT_MAX/10; c = shgetc(f))
-        x = 10*x + c-'0';
+        x = 10*x + (c-'0');
     for (y=x; c-'0'<10U && y<LLONG_MAX/100; c = shgetc(f))
-        y = 10*y + c-'0';
+        y = 10*y + (c-'0');
     for (; c-'0'<10U; c = shgetc(f));
     shunget(f);
     return neg ? -y : y;