[FFmpeg-cvslog] swscale/output: Fix undefined shifts

Michael Niedermayer git at videolan.org
Wed Mar 25 18:47:16 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 25 18:30:00 2015 +0100| [bdcd36a4c81c50254f6204e83e0c14adc1391e66] | committer: Michael Niedermayer

swscale/output: Fix undefined shifts

Fixes: da14e86d8462be6493eab16bc2d40f88/asan_heap-oob_204cfd2_528_cov_340150052_COMPRESS.BMP

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bdcd36a4c81c50254f6204e83e0c14adc1391e66
---

 libswscale/output.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libswscale/output.c b/libswscale/output.c
index 88fa2b5..6048e2b 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
@@ -1709,8 +1709,8 @@ yuv2rgb_full_1_c_template(SwsContext *c, const int16_t *buf0,
         int A = 0; //init to silence warning
         for (i = 0; i < dstW; i++) {
             int Y = buf0[i] << 2;
-            int U = (ubuf0[i] - (128<<7)) << 2;
-            int V = (vbuf0[i] - (128<<7)) << 2;
+            int U = (ubuf0[i] - (128<<7)) * 4;
+            int V = (vbuf0[i] - (128<<7)) * 4;
 
             if (hasAlpha) {
                 A = (abuf0[i] + 64) >> 7;



More information about the ffmpeg-cvslog mailing list