[SCM] libav/master: swscale: Fix an undefined behaviour

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun May 4 21:36:35 UTC 2014


The following commit has been merged in the master branch:
commit 9a2387cfb1a99e4b00593c22074929cdc73410f0
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Fri May 2 00:21:23 2014 +0200

    swscale: Fix an undefined behaviour
    
    Prevent a division by zero down the codepath.
    
    Sample-Id: 00001721-google
    Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
    CC: libav-stable at libav.org
    (cherry picked from commit 3a177a9cca924e097265b32f9282814f6b653e08)
    (cherry picked from commit 0499f7809c1fcc33ed710cdf771a18b374702135)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index f0a2b46..23eb4a4 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -316,7 +316,7 @@ static int initFilter(int16_t **outFilter, int32_t **filterPos,
 
         xDstInSrc = xInc - 0x10000;
         for (i = 0; i < dstW; i++) {
-            int xx = (xDstInSrc - ((filterSize - 2) << 16)) / (1 << 17);
+            int xx = (xDstInSrc - ((int64_t)(filterSize - 2) << 16)) / (1 << 17);
             int j;
             (*filterPos)[i] = xx;
             for (j = 0; j < filterSize; j++) {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list