--- a/jdk/src/solaris/native/sun/awt/fontpath.c	Tue Oct 21 08:25:38 2008 -0700
+++ b/jdk/src/solaris/native/sun/awt/fontpath.c	Tue Oct 28 14:40:58 2008 -0700
@@ -1233,7 +1233,7 @@
         for (j=0; j<nfonts; j++) {
             FcPattern *fontPattern = fontset->fonts[j];
             FcChar8 *fontformat;
-            FcCharSet *unionCharset, *charset;
+            FcCharSet *unionCharset = NULL, *charset;
 
             fontformat = NULL;
             (*FcPatternGetString)(fontPattern, FC_FONTFORMAT, 0, &fontformat);
@@ -1256,7 +1256,7 @@
             if (nfonts==10) {
                 minGlyphs = 50;
             }
-            if (j == 0) {
+            if (unionCharset == NULL) {
                 unionCharset = charset;
             } else {
                 if ((*FcCharSetSubtractCount)(charset, unionCharset)