highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/sonic: Fix two undefined integer overflows

Browse Source 
Fixes: signed integer overflow: 2147483372 - -148624 cannot be represented in type 'int'
Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SONIC_fuzzer-5477177805373440
Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SONIC_fuzzer-6681622236233728

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 2632e90493)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2023-04-16 17:19:10 +02:00
parent 8b43d791be
commit 544c29a40c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/sonic.c
View File

@ -467,7 +467,7 @@ static void predictor_init_state(int *k, int *state, int order)
static int predictor_calc_error(int *k, int *state, int order, int error) static int predictor_calc_error(int *k, int *state, int order, int error)
{ {
int i, x = error - shift_down(k[order-1] * (unsigned)state[order-1], LATTICE_SHIFT); int i, x = error - (unsigned)shift_down(k[order-1] * (unsigned)state[order-1], LATTICE_SHIFT);
#if 1 #if 1
int *k_ptr = &(k[order-2]), int *k_ptr = &(k[order-2]),
@ -1009,7 +1009,7 @@ static int sonic_decode_frame(AVCodecContext *avctx,
if (s->lossless) if (s->lossless)
quant = 1; quant = 1;
else else
quant = get_symbol(&c, state, 0) * SAMPLE_FACTOR; quant = get_symbol(&c, state, 0) * (unsigned)SAMPLE_FACTOR;
// av_log(NULL, AV_LOG_INFO, "quant: %d\n", quant); // av_log(NULL, AV_LOG_INFO, "quant: %d\n", quant);