virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/osq: Switch back to av_ceil_log2()

Browse Source 
This returns to code closer to prior 56c334d732
The prior fixes should limit the sum and avoid the need for double argument log2()

Fixes: Assertion n>=0 && n<=32 failed at libavcodec/get_bits.h:406
Fixes: 410109093/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_OSQ_fuzzer-6550900028276736

No testcases except fuzzers

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2025-06-17 02:31:28 +02:00
parent b587afcb65
commit a5f861d335
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/osq.c
View File

@ -165,7 +165,8 @@ static int update_residue_parameter(OSQChannel *cb)
if (!sum) if (!sum)
return 0; return 0;
x = sum / cb->count; x = sum / cb->count;
rice_k = ceil(log2(x)); av_assert2(x <= 0x80000000U);
rice_k = av_ceil_log2(x);
if (rice_k >= 30) { if (rice_k >= 30) {
double f = floor(sum / 1.4426952 + 0.5); double f = floor(sum / 1.4426952 + 0.5);
if (f <= 1) { if (f <= 1) {