avcodec/mlpdsp: Fix signed integer overflow, 2nd try
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Nov 2017 17:45:45 +0000 (18:45 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 30 Dec 2017 20:11:32 +0000 (21:11 +0100)
The outputted bits should match what is used in the lossless check

Fixes: runtime error: signed integer overflow: -538697856 * 256 cannot be represented in type 'int'
Fixes: 4326/clusterfuzz-testcase-minimized-5689449645080576

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 97c00edaa043043c29d985653e7e1687b56dfa23)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/mlpdsp.c

index 4e3a16c..32a4503 100644 (file)
@@ -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 * 256;
+                *data_32++ = sample * 256U;
             else
                 *data_16++ = sample >> 8;
         }