diff mbox

[FFmpeg-devel] avcodec/mlpdsp: Fix undefined shift ff_mlp_pack_output()

Message ID 20171115032545.17533-1-michael@niedermayer.cc
State Accepted
Commit 4f7f70738e8dd77a698a5e28bba552ea7064af21
Headers show

Commit Message

Michael Niedermayer Nov. 15, 2017, 3:25 a.m. UTC 
Fixes: runtime error: left shift of negative value -7862264
Fixes: 4074/clusterfuzz-testcase-minimized-4516104123711488

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

Comments

Michael Niedermayer Nov. 18, 2017, 1:49 a.m. UTC | #1 
On Wed, Nov 15, 2017 at 04:25:45AM +0100, Michael Niedermayer wrote:
> Fixes: runtime error: left shift of negative value -7862264
> Fixes: 4074/clusterfuzz-testcase-minimized-4516104123711488
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/mlpdsp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

applied

[...]
diff mbox

Patch

diff --git a/libavcodec/mlpdsp.c b/libavcodec/mlpdsp.c
index fbafa92d72..4e3a16c781 100644
--- a/libavcodec/mlpdsp.c
+++ b/libavcodec/mlpdsp.c
@@ -117,7 +117,7 @@  int32_t ff_mlp_pack_output(int32_t lossless_check_data,
                           (1U << output_shift[mat_ch]);
             lossless_check_data ^= (sample & 0xffffff) << mat_ch;
             if (is32)
-                *data_32++ = sample << 8;
+                *data_32++ = sample * 256;
             else
                 *data_16++ = sample >> 8;
         }