Fix out-of-bounds read where the value wasn't actually used. (#106744,

Tue Apr 15 03:54:01 2003  Owen Taylor  <otaylor@redhat.com>

        * modules/hangul/hangul-{x,xft}.c: Fix out-of-bounds read
        where the value wasn't actually used. (#106744, Morten Welinder)

7 files changed, 54 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 8209cdca..8ad4a053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 15 03:54:01 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/hangul/hangul-{x,xft}.c: Fix out-of-bounds read
+	where the value wasn't actually used. (#106744, Morten Welinder)
+
 Tue Apr 15 03:47:37 2003  Owen Taylor  <otaylor@redhat.com>
  
         * pango/pango-attributes.c (pango_attr_iterator_next): Return 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 8209cdca..8ad4a053 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Tue Apr 15 03:54:01 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/hangul/hangul-{x,xft}.c: Fix out-of-bounds read
+	where the value wasn't actually used. (#106744, Morten Welinder)
+
 Tue Apr 15 03:47:37 2003  Owen Taylor  <otaylor@redhat.com>
  
         * pango/pango-attributes.c (pango_attr_iterator_next): Return 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 8209cdca..8ad4a053 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+Tue Apr 15 03:54:01 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/hangul/hangul-{x,xft}.c: Fix out-of-bounds read
+	where the value wasn't actually used. (#106744, Morten Welinder)
+
 Tue Apr 15 03:47:37 2003  Owen Taylor  <otaylor@redhat.com>
  
         * pango/pango-attributes.c (pango_attr_iterator_next): Return 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 8209cdca..8ad4a053 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Tue Apr 15 03:54:01 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/hangul/hangul-{x,xft}.c: Fix out-of-bounds read
+	where the value wasn't actually used. (#106744, Morten Welinder)
+
 Tue Apr 15 03:47:37 2003  Owen Taylor  <otaylor@redhat.com>
  
         * pango/pango-attributes.c (pango_attr_iterator_next): Return 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 8209cdca..8ad4a053 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Tue Apr 15 03:54:01 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/hangul/hangul-{x,xft}.c: Fix out-of-bounds read
+	where the value wasn't actually used. (#106744, Morten Welinder)
+
 Tue Apr 15 03:47:37 2003  Owen Taylor  <otaylor@redhat.com>
  
         * pango/pango-attributes.c (pango_attr_iterator_next): Return 
diff --git a/modules/hangul/hangul-x.c b/modules/hangul/hangul-x.c
index 1cf5c91c..21e956d6 100644
--- a/modules/hangul/hangul-x.c
+++ b/modules/hangul/hangul-x.c
@@ -739,24 +739,26 @@ hangul_engine_shape (PangoFont        *font,
   
   for (i = 0; i < n_chars; i++)
     {
-      gunichar prev = jamos[n_jamos - 1];
       gunichar wc;
 
       wc = g_utf8_get_char (p);
 
       /* Check syllable boundaries. */
-      if (n_jamos &&
-	  ((!IS_L (prev) && IS_S (wc)) ||
-	   (IS_T (prev) && IS_L (wc)) ||
-	   (IS_V (prev) && IS_L (wc)) ||
-	   (IS_T (prev) && IS_V (wc))))
+      if (n_jamos)
 	{
-	  /* Draw a syllable. */
-
-	  (*render_func) (font, subfont, jamos, n_jamos,
-			  glyphs, &n_glyphs, start - text);
-	  n_jamos = 0;
-	  start = p;
+	  gunichar prev = jamos[n_jamos - 1];
+	  if ((!IS_L (prev) && IS_S (wc)) ||
+	      (IS_T (prev) && IS_L (wc)) ||
+	      (IS_V (prev) && IS_L (wc)) ||
+	      (IS_T (prev) && IS_V (wc)))
+	    {
+	      /* Draw a syllable. */
+	      
+	      (*render_func) (font, subfont, jamos, n_jamos,
+			      glyphs, &n_glyphs, start - text);
+	      n_jamos = 0;
+	      start = p;
+	    }
 	}
 
       if (n_jamos == max_jamos)
diff --git a/modules/hangul/hangul-xft.c b/modules/hangul/hangul-xft.c
index be796693..09bd6002 100644
--- a/modules/hangul/hangul-xft.c
+++ b/modules/hangul/hangul-xft.c
@@ -294,26 +294,28 @@ hangul_engine_shape (PangoFont        *font,
 
   for (i = 0; i < n_chars; i++)
     {
-      gunichar prev = jamos[n_jamos - 1];
       gunichar wc;
 
       wc = g_utf8_get_char (p);
 
       /* Check syllable boundaries. */
-      if (n_jamos &&
-	  ((!IS_L (prev) && IS_S (wc)) ||
-	   (IS_T (prev) && IS_L (wc)) ||
-	   (IS_V (prev) && IS_L (wc)) ||
-	   (IS_T (prev) && IS_V (wc)) ||
-	   IS_M(prev)))
+      if (n_jamos)
 	{
-	  /* Draw a syllable. */
-	  render_syllable (font, jamos, n_jamos, glyphs,
-			   &n_glyphs, start - text);
-	  n_jamos = 0;
-	  start = p;
+	  gunichar prev = jamos[n_jamos - 1];
+	  if ((!IS_L (prev) && IS_S (wc)) ||
+	      (IS_T (prev) && IS_L (wc)) ||
+	      (IS_V (prev) && IS_L (wc)) ||
+	      (IS_T (prev) && IS_V (wc)) ||
+	      IS_M(prev))
+	    {
+	      /* Draw a syllable. */
+	      render_syllable (font, jamos, n_jamos, glyphs,
+			       &n_glyphs, start - text);
+	      n_jamos = 0;
+	      start = p;
+	    }
 	}
-
+	  
       if (n_jamos == max_jamos)
 	{
 	  max_jamos += 3;	/* at most 3 for each syllable code (L+V+T) */