ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/osq: avoid using too large numbers for shifts and integers in update_residue_parameter()

Browse Source 
Fixes: 2.96539e+09 is outside the range of representable values of type 'int'
Fixes: Assertion n>=0 && n<=32 failed at libavcodec/get_bits.h:423
Fixes: 62241/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_OSQ_fuzzer-4525761925873664
Fixes: 70406/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_OSQ_fuzzer-6545326804434944

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-09-15 00:49:41 +02:00
parent 3cd077e282
commit 56c334d732
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/osq.c
View File

@ -161,11 +161,15 @@ static int update_residue_parameter(OSQChannel *cb)
sum = cb->sum;
x = sum / cb->count;
rice_k = av_ceil_log2(x);
rice_k = ceil(log2(x));
if (rice_k >= 30) {
rice_k = floor(sum / 1.4426952 + 0.5);
if (rice_k < 1)
double f = floor(sum / 1.4426952 + 0.5);
if (f <= 1) {
rice_k = 1;
} else if (f >= 31) {
rice_k = 31;
} else
rice_k = f;
}
return rice_k;