diff mbox series

[FFmpeg-devel,2/2] avutil/common: Fix integer overflow in av_ceil_log2_c()

Message ID 20200627234653.743-2-michael@niedermayer.cc
State Accepted
Commit e409262837712016097c187e97bf99aadf6a4cdf
Headers show
Series [FFmpeg-devel,1/2] avcodec/wmalosslessdec: fix overflow with pred in revert_cdlms
Related show

Checks

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

Commit Message

Michael Niedermayer June 27, 2020, 11:46 p.m. UTC
Fixes: left shift of 1913647649 by 1 places cannot be represented in type 'int'
Fixes: 23572/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5082619795734528

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

Comments

Michael Niedermayer June 30, 2020, 12:01 p.m. UTC | #1
On Sun, Jun 28, 2020 at 01:46:53AM +0200, Michael Niedermayer wrote:
> Fixes: left shift of 1913647649 by 1 places cannot be represented in type 'int'
> Fixes: 23572/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMALOSSLESS_fuzzer-5082619795734528
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavutil/common.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply

[...]
diff mbox series

Patch

diff --git a/libavutil/common.h b/libavutil/common.h
index 2777cea9f9..92b721a59c 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -371,7 +371,7 @@  static av_always_inline av_const double av_clipd_c(double a, double amin, double
  */
 static av_always_inline av_const int av_ceil_log2_c(int x)
 {
-    return av_log2((x - 1) << 1);
+    return av_log2((x - 1U) << 1);
 }
 
 /**