Skip to content

F
ffmpeg
Unverified Commit 9e6c5b6e authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

swscale/output: alpha can become negative after scaling, use multiply 

Fixes: left shift of negative value -3245
Fixes: 69047/clusterfuzz-testcase-minimized-ffmpeg_SWS_fuzzer-6571511551950848

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent c22488f7
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
libswscale/output.c
View file @ 9e6c5b6e
......@@ -1221,8 +1221,8 @@ yuv2rgba64_1_c_template(SwsContext *c, const int32_t *buf0,
Y2 += (1 << 13) - (1 << 29);
if (hasAlpha) {
A1 = abuf0[i * 2 ] << 11;
A2 = abuf0[i * 2 + 1] << 11;
A1 = abuf0[i * 2 ] * (1 << 11);
A2 = abuf0[i * 2 + 1] * (1 << 11);
A1 += 1 << 13;
A2 += 1 << 13;
......@@ -1267,8 +1267,8 @@ yuv2rgba64_1_c_template(SwsContext *c, const int32_t *buf0,
Y2 += (1 << 13) - (1 << 29);
if (hasAlpha) {
A1 = abuf0[i * 2 ] << 11;
A2 = abuf0[i * 2 + 1] << 11;
A1 = abuf0[i * 2 ] * (1 << 11);
A2 = abuf0[i * 2 + 1] * (1 << 11);
A1 += 1 << 13;
A2 += 1 << 13;
......@@ -1439,7 +1439,7 @@ yuv2rgba64_full_1_c_template(SwsContext *c, const int32_t *buf0,
Y += (1 << 13) - (1 << 29);
if (hasAlpha) {
A = abuf0[i] << 11;
A = abuf0[i] * (1 << 11);
A += 1 << 13;
}
......@@ -1472,7 +1472,7 @@ yuv2rgba64_full_1_c_template(SwsContext *c, const int32_t *buf0,
Y += (1 << 13) - (1 << 29);
if (hasAlpha) {
A = abuf0[i] << 11;
A = abuf0[i] * (1 << 11);
A += 1 << 13;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment