Bug 646213 - Hangul Jamo render as U+00xx boxes and produce valgrind errors

Fix the previous fix!

diff --git a/modules/hangul/hangul-fc.c b/modules/hangul/hangul-fc.c
index b9ffa9b..2ef56ec 100644 (file)
--- a/modules/hangul/hangul-fc.c
+++ b/modules/hangul/hangul-fc.c
@@ -338,8 +338,9 @@ render_syllable (PangoFont *font, const char *str, int length,
       oldlen = *n_glyphs;
       for (j = 0; j < 3 && (__jamo_to_ksc5601[jindex][j] != 0); j++)
        {
-         wc = __jamo_to_ksc5601[jindex][j] - KSC_JAMOBASE + UNI_JAMOBASE;
-         index = (wc >= 0x3131) ? find_char (font, wc) : 0;
+         gunichar comp_wc;
+         comp_wc = __jamo_to_ksc5601[jindex][j] - KSC_JAMOBASE + UNI_JAMOBASE;
+         index = (comp_wc >= 0x3131) ? find_char (font, comp_wc) : 0;
          pango_glyph_string_set_size (glyphs, *n_glyphs + 1);
          if (!index)
            {