virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avutil/avsscanf: Add () to avoid integer overflow in scanexp()

Browse Source 
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>
(cherry picked from commit 42b28565aa852b98d95d8d02f7b0781999f9d533)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-06-18 11:56:53 +02:00
parent 3571d9d654
commit 836f6fb567
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/avsscanf.c
View File

@ -229,9 +229,9 @@ static long long scanexp(FFFILE *f, int pok)
return LLONG_MIN; return LLONG_MIN;
} }
for (x=0; c-'0'<10U && x<INT_MAX/10; c = shgetc(f)) 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)) 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)); for (; c-'0'<10U; c = shgetc(f));
shunget(f); shunget(f);
return neg ? -y : y; return neg ? -y : y;