diff mbox

[FFmpeg-devel,1/8] avcodec/mpc8: Fix 32bit mask/enum

Message ID 20190810210949.1743-1-michael@niedermayer.cc
State Accepted
Commit e8bb949ade4078ca318a9b3475cb7a6cfc7e4639
Headers show

Commit Message

Michael Niedermayer Aug. 10, 2019, 9:09 p.m. UTC 
Fixes: left shift of 1 by 31 places cannot be represented in type 'int'
Fixes: 15817/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPC8_fuzzer-5636626409062400

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

Comments

Paul B Mahol Aug. 11, 2019, 9:05 a.m. UTC | #1 
LGTM

On Sat, Aug 10, 2019 at 11:18 PM Michael Niedermayer <michael@niedermayer.cc>
wrote:

> Fixes: left shift of 1 by 31 places cannot be represented in type 'int'
> Fixes:
> 15817/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPC8_fuzzer-5636626409062400
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by
> <https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by>:
> Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/mpc8.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
> index d7baac2f04..03838a9351 100644
> --- a/libavcodec/mpc8.c
> +++ b/libavcodec/mpc8.c
> @@ -62,7 +62,7 @@ static inline int mpc8_dec_enum(GetBitContext *gb, int
> k, int n)
>      do {
>          n--;
>          if (code >= C[n]) {
> -            bits |= 1 << n;
> +            bits |= 1U << n;
>              code -= C[n];
>              C -= 32;
>              k--;
> --
> 2.22.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Michael Niedermayer Aug. 11, 2019, 3:12 p.m. UTC | #2 
On Sun, Aug 11, 2019 at 11:05:41AM +0200, Paul B Mahol wrote:
> LGTM

will apply

thx

[...]
diff mbox

Patch

diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index d7baac2f04..03838a9351 100644
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -62,7 +62,7 @@  static inline int mpc8_dec_enum(GetBitContext *gb, int k, int n)
     do {
         n--;
         if (code >= C[n]) {
-            bits |= 1 << n;
+            bits |= 1U << n;
             code -= C[n];
             C -= 32;
             k--;