From: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Sat, 16 May 2009 12:33:35 +0000 (-0400)
Subject: Don't read potentially uninitialized data in pixman_CombineMaskU()
X-Git-Tag: 1.0_branch~1174^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=010e28653f95bb78215e3cacb6a4f47d9a289fde;p=profile%2Fivi%2Fpixman.git

Don't read potentially uninitialized data in pixman_CombineMaskU()

This is mainly to quiet valgrind. The data in question would only be
uninitialized when the corresponding mask pixel was zero, so the end
result is zero in any case.
---

diff --git a/pixman/combine.inc b/pixman/combine.inc
index ff18732..ef19d01 100644
--- a/pixman/combine.inc
+++ b/pixman/combine.inc
@@ -24,15 +24,21 @@
 static force_inline comp4_t
 combineMask (const comp4_t *src, const comp4_t *mask, int i)
 {
-    comp4_t s = *(src + i);
+    comp4_t s, m;
 
     if (mask)
     {
-	comp4_t m = *(mask + i) >> A_SHIFT;
-	
-	FbByteMul (s, m);
+	m = *(mask + i) >> A_SHIFT;
+
+	if (!m)
+	    return 0;
     }
-    
+
+    s = *(src + i);
+
+    if (mask)
+	FbByteMul (s, m);
+
     return s;
 }