summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-11-20 18:45:45 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-12-02 00:28:59 +0100
commit78b6e8fb233f52284d6a3bee169361f5ee82c79f (patch)
treebccc5ce9aae567eefb6c004422d7c129b06b7bc1
parent71e40180cb1df511cfb67e17ff041f69d8d11d32 (diff)
downloadffmpeg-78b6e8fb233f52284d6a3bee169361f5ee82c79f.tar.gz
avcodec/mlpdsp: Fix signed integer overflow, 2nd try
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>
-rw-r--r--libavcodec/mlpdsp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mlpdsp.c b/libavcodec/mlpdsp.c
index 4e3a16c781..32a4503b64 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 * 256;
+ *data_32++ = sample * 256U;
else
*data_16++ = sample >> 8;
}