Added missing memcpy() from the static jamo buffer to allocated jamo

2002-10-15  Changwoo Ryu  <cwryu@debian.org>

	* modules/hangul/hangul-xft.c (hangul_engine_shape):
	* modules/hangul/hangul-x.c (hangul_engine_shape): Added missing
	memcpy() from the static jamo buffer to allocated jamo buffer
	(#95569).  Thanks to Jungshik Shin.

9 files changed, 54 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b806971b..964dfbdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-15  Changwoo Ryu  <cwryu@debian.org>
+
+	* modules/hangul/hangul-xft.c (hangul_engine_shape): 
+	* modules/hangul/hangul-x.c (hangul_engine_shape): Added missing
+	memcpy() from the static jamo buffer to allocated jamo buffer
+	(#95569).  Thanks to Jungshik Shin.
+
 Mon Oct 14 15:39:41 2002  Manish Singh  <yosh@gimp.org>
 
 	* pango/pango-context.c pango/pango-layout.c pango/pangoft2.c
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index b806971b..964dfbdb 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+2002-10-15  Changwoo Ryu  <cwryu@debian.org>
+
+	* modules/hangul/hangul-xft.c (hangul_engine_shape): 
+	* modules/hangul/hangul-x.c (hangul_engine_shape): Added missing
+	memcpy() from the static jamo buffer to allocated jamo buffer
+	(#95569).  Thanks to Jungshik Shin.
+
 Mon Oct 14 15:39:41 2002  Manish Singh  <yosh@gimp.org>
 
 	* pango/pango-context.c pango/pango-layout.c pango/pangoft2.c
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index b806971b..964dfbdb 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+2002-10-15  Changwoo Ryu  <cwryu@debian.org>
+
+	* modules/hangul/hangul-xft.c (hangul_engine_shape): 
+	* modules/hangul/hangul-x.c (hangul_engine_shape): Added missing
+	memcpy() from the static jamo buffer to allocated jamo buffer
+	(#95569).  Thanks to Jungshik Shin.
+
 Mon Oct 14 15:39:41 2002  Manish Singh  <yosh@gimp.org>
 
 	* pango/pango-context.c pango/pango-layout.c pango/pangoft2.c
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index b806971b..964dfbdb 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+2002-10-15  Changwoo Ryu  <cwryu@debian.org>
+
+	* modules/hangul/hangul-xft.c (hangul_engine_shape): 
+	* modules/hangul/hangul-x.c (hangul_engine_shape): Added missing
+	memcpy() from the static jamo buffer to allocated jamo buffer
+	(#95569).  Thanks to Jungshik Shin.
+
 Mon Oct 14 15:39:41 2002  Manish Singh  <yosh@gimp.org>
 
 	* pango/pango-context.c pango/pango-layout.c pango/pangoft2.c
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index b806971b..964dfbdb 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+2002-10-15  Changwoo Ryu  <cwryu@debian.org>
+
+	* modules/hangul/hangul-xft.c (hangul_engine_shape): 
+	* modules/hangul/hangul-x.c (hangul_engine_shape): Added missing
+	memcpy() from the static jamo buffer to allocated jamo buffer
+	(#95569).  Thanks to Jungshik Shin.
+
 Mon Oct 14 15:39:41 2002  Manish Singh  <yosh@gimp.org>
 
 	* pango/pango-context.c pango/pango-layout.c pango/pangoft2.c
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index b806971b..964dfbdb 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+2002-10-15  Changwoo Ryu  <cwryu@debian.org>
+
+	* modules/hangul/hangul-xft.c (hangul_engine_shape): 
+	* modules/hangul/hangul-x.c (hangul_engine_shape): Added missing
+	memcpy() from the static jamo buffer to allocated jamo buffer
+	(#95569).  Thanks to Jungshik Shin.
+
 Mon Oct 14 15:39:41 2002  Manish Singh  <yosh@gimp.org>
 
 	* pango/pango-context.c pango/pango-layout.c pango/pangoft2.c
diff --git a/modules/hangul/hangul-fc.c b/modules/hangul/hangul-fc.c
index ab934832..9c693a77 100644
--- a/modules/hangul/hangul-fc.c
+++ b/modules/hangul/hangul-fc.c
@@ -170,7 +170,10 @@ hangul_engine_shape (PangoFont        *font,
 	{
 	  max_jamos++;
 	  if (jamos == jamos_static)
-	    jamos = g_new (gunichar, max_jamos);
+	    {
+	      jamos = g_new (gunichar, max_jamos);
+	      memcpy(jamos, jamos_static, n_jamos*sizeof(gunichar2));
+	    }
 	  else
 	    jamos = g_renew (gunichar, jamos, max_jamos);
 	}
diff --git a/modules/hangul/hangul-x.c b/modules/hangul/hangul-x.c
index fc5806cd..799f3bc1 100644
--- a/modules/hangul/hangul-x.c
+++ b/modules/hangul/hangul-x.c
@@ -759,7 +759,10 @@ hangul_engine_shape (PangoFont        *font,
 		{
 		  max_jamos++;
 		  if (jamos == jamos_static)
-		    jamos = g_new (gunichar2, max_jamos);
+		    {
+		      jamos = g_new (gunichar2, max_jamos);
+		      memcpy(jamos, jamos_static, n_jamos*sizeof(gunichar2));
+		    }
 		  else
 		    jamos = g_renew (gunichar2, jamos, max_jamos);
 		}
diff --git a/modules/hangul/hangul-xft.c b/modules/hangul/hangul-xft.c
index ab934832..9c693a77 100644
--- a/modules/hangul/hangul-xft.c
+++ b/modules/hangul/hangul-xft.c
@@ -170,7 +170,10 @@ hangul_engine_shape (PangoFont        *font,
 	{
 	  max_jamos++;
 	  if (jamos == jamos_static)
-	    jamos = g_new (gunichar, max_jamos);
+	    {
+	      jamos = g_new (gunichar, max_jamos);
+	      memcpy(jamos, jamos_static, n_jamos*sizeof(gunichar2));
+	    }
 	  else
 	    jamos = g_renew (gunichar, jamos, max_jamos);
 	}