From 92d4c4837564d96a1a40cbb579e71694492bc8cd Mon Sep 17 00:00:00 2001
From: jgodinez <unknown>
Date: Fri, 22 Feb 2013 13:20:16 -0800
Subject: [PATCH] 8005796: [parfait] Possible uninitialised variable at
 jdk/src/share/native/sun/java2d/loops/ByteBinary1Bit.c Reviewed-by: prr,
 vadim, flar Contributed-by: jia-hong.chen@oracle.com

---
 src/share/native/sun/java2d/loops/AnyByteBinary.h  | 5 ++++-
 src/share/native/sun/java2d/loops/ByteIndexed.h    | 5 ++++-
 src/share/native/sun/java2d/loops/IntArgb.h        | 3 ++-
 src/share/native/sun/java2d/loops/IntArgbBm.h      | 3 ++-
 src/share/native/sun/java2d/loops/IntArgbPre.h     | 3 ++-
 src/share/native/sun/java2d/loops/Ushort4444Argb.h | 3 ++-
 src/share/native/sun/java2d/loops/UshortIndexed.h  | 5 ++++-
 7 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/share/native/sun/java2d/loops/AnyByteBinary.h b/src/share/native/sun/java2d/loops/AnyByteBinary.h
index abe7f230b..3b1fa03b0 100644
--- a/src/share/native/sun/java2d/loops/AnyByteBinary.h
+++ b/src/share/native/sun/java2d/loops/AnyByteBinary.h
@@ -153,7 +153,10 @@
     jint PREFIX ## rgb;
 
 #define InitByteBinaryAlphaLoadData(TYPE, PREFIX, pRasInfo) \
-    PREFIX ## Lut = (pRasInfo)->lutBase
+    do { \
+        PREFIX ## Lut = (pRasInfo)->lutBase; \
+        PREFIX ## rgb = 0; \
+    } while (0)
 
 #define LoadAlphaFromByteBinaryFor4ByteArgb(TYPE, pRas, PREFIX, COMP_PREFIX) \
     do { \
diff --git a/src/share/native/sun/java2d/loops/ByteIndexed.h b/src/share/native/sun/java2d/loops/ByteIndexed.h
index 3917c238e..215cfc0e1 100644
--- a/src/share/native/sun/java2d/loops/ByteIndexed.h
+++ b/src/share/native/sun/java2d/loops/ByteIndexed.h
@@ -202,7 +202,10 @@ typedef jubyte  ByteIndexedBmDataType;
     jint PREFIX ## rgb;
 
 #define InitByteIndexedAlphaLoadData(PREFIX, pRasInfo) \
-    PREFIX ## Lut = (pRasInfo)->lutBase
+    do { \
+        PREFIX ## Lut = (pRasInfo)->lutBase; \
+        PREFIX ## rgb = 0; \
+    } while (0)
 
 #define LoadAlphaFromByteIndexedFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff --git a/src/share/native/sun/java2d/loops/IntArgb.h b/src/share/native/sun/java2d/loops/IntArgb.h
index aec63431c..f4ec00524 100644
--- a/src/share/native/sun/java2d/loops/IntArgb.h
+++ b/src/share/native/sun/java2d/loops/IntArgb.h
@@ -122,7 +122,8 @@ typedef jint    IntArgbDataType;
 #define DeclareIntArgbAlphaLoadData(PREFIX) \
     jint PREFIX;
 
-#define InitIntArgbAlphaLoadData(PREFIX, pRasInfo)
+#define InitIntArgbAlphaLoadData(PREFIX, pRasInfo) \
+    PREFIX = 0
 
 #define LoadAlphaFromIntArgbFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff --git a/src/share/native/sun/java2d/loops/IntArgbBm.h b/src/share/native/sun/java2d/loops/IntArgbBm.h
index 81d551820..675fba1d2 100644
--- a/src/share/native/sun/java2d/loops/IntArgbBm.h
+++ b/src/share/native/sun/java2d/loops/IntArgbBm.h
@@ -133,7 +133,8 @@ typedef jint    IntArgbBmDataType;
 #define DeclareIntArgbBmAlphaLoadData(PREFIX) \
     jint PREFIX;
 
-#define InitIntArgbBmAlphaLoadData(PREFIX, pRasInfo)
+#define InitIntArgbBmAlphaLoadData(PREFIX, pRasInfo) \
+    PREFIX = 0
 
 #define LoadAlphaFromIntArgbBmFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff --git a/src/share/native/sun/java2d/loops/IntArgbPre.h b/src/share/native/sun/java2d/loops/IntArgbPre.h
index 5ffb9dacb..c45013d0e 100644
--- a/src/share/native/sun/java2d/loops/IntArgbPre.h
+++ b/src/share/native/sun/java2d/loops/IntArgbPre.h
@@ -153,7 +153,8 @@ typedef jint    IntArgbPreDataType;
 #define DeclareIntArgbPreAlphaLoadData(PREFIX) \
     jint PREFIX;
 
-#define InitIntArgbPreAlphaLoadData(PREFIX, pRasInfo)
+#define InitIntArgbPreAlphaLoadData(PREFIX, pRasInfo) \
+    PREFIX = 0
 
 #define LoadAlphaFromIntArgbPreFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff --git a/src/share/native/sun/java2d/loops/Ushort4444Argb.h b/src/share/native/sun/java2d/loops/Ushort4444Argb.h
index 348e03b7d..aa50d8b0f 100644
--- a/src/share/native/sun/java2d/loops/Ushort4444Argb.h
+++ b/src/share/native/sun/java2d/loops/Ushort4444Argb.h
@@ -120,7 +120,8 @@ typedef jushort Ushort4444ArgbDataType;
 #define DeclareUshort4444ArgbAlphaLoadData(PREFIX) \
     jint PREFIX;
 
-#define InitUshort4444ArgbAlphaLoadData(PREFIX, pRasInfo)
+#define InitUshort4444ArgbAlphaLoadData(PREFIX, pRasInfo) \
+    PREFIX = 0
 
 #define LoadAlphaFromUshort4444ArgbFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff --git a/src/share/native/sun/java2d/loops/UshortIndexed.h b/src/share/native/sun/java2d/loops/UshortIndexed.h
index 7786bda38..6a4b5b13e 100644
--- a/src/share/native/sun/java2d/loops/UshortIndexed.h
+++ b/src/share/native/sun/java2d/loops/UshortIndexed.h
@@ -170,7 +170,10 @@ typedef jushort UshortIndexedBmDataType;
     jint PREFIX ## rgb;
 
 #define InitUshortIndexedAlphaLoadData(PREFIX, pRasInfo) \
-    PREFIX ## Lut = (pRasInfo)->lutBase
+    do { \
+        PREFIX ## Lut = (pRasInfo)->lutBase; \
+        PREFIX ## rgb = 0; \
+    } while (0)
 
 #define LoadAlphaFromUshortIndexedFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
-- 
GitLab