diff options
| author | Changwoo Ryu <cwryu@src.gnome.org> | 2002-10-15 03:03:03 +0000 |
|---|---|---|
| committer | Changwoo Ryu <cwryu@src.gnome.org> | 2002-10-15 03:03:03 +0000 |
| commit | bae3bda239b15a4b3712e484233701954dbe30fb (patch) | |
| tree | 9fe06924bc600b1493762d62e68ab66c3aef6bfc | |
| parent | 1cef12571f9de59a80dcf3804d90f3090dd24d29 (diff) | |
| download | pango-bae3bda239b15a4b3712e484233701954dbe30fb.tar.gz | |
Fixed leaks when the Hangul jamos length >= 6 (#95730).
* modules/hangul/hangul-x.c (hangul_engine_shape): Fixed leaks
when the Hangul jamos length >= 6 (#95730).
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | modules/hangul/hangul-x.c | 13 |
7 files changed, 37 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2002-10-15 Changwoo Ryu <cwryu@debian.org> + + * modules/hangul/hangul-x.c (hangul_engine_shape): Fixed leaks + when the Hangul jamos length >= 6 (#95730). + 2002-10-14 Sven Neumann <sven@gimp.org> * modules/arabic/arabic-ft2.c (get_ruleset): unref the PangoOTInfo diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 2407f0f7..db6e1973 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2002-10-15 Changwoo Ryu <cwryu@debian.org> + + * modules/hangul/hangul-x.c (hangul_engine_shape): Fixed leaks + when the Hangul jamos length >= 6 (#95730). + 2002-10-14 Sven Neumann <sven@gimp.org> * modules/arabic/arabic-ft2.c (get_ruleset): unref the PangoOTInfo diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 2407f0f7..db6e1973 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +2002-10-15 Changwoo Ryu <cwryu@debian.org> + + * modules/hangul/hangul-x.c (hangul_engine_shape): Fixed leaks + when the Hangul jamos length >= 6 (#95730). + 2002-10-14 Sven Neumann <sven@gimp.org> * modules/arabic/arabic-ft2.c (get_ruleset): unref the PangoOTInfo diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 2407f0f7..db6e1973 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +2002-10-15 Changwoo Ryu <cwryu@debian.org> + + * modules/hangul/hangul-x.c (hangul_engine_shape): Fixed leaks + when the Hangul jamos length >= 6 (#95730). + 2002-10-14 Sven Neumann <sven@gimp.org> * modules/arabic/arabic-ft2.c (get_ruleset): unref the PangoOTInfo diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 2407f0f7..db6e1973 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2002-10-15 Changwoo Ryu <cwryu@debian.org> + + * modules/hangul/hangul-x.c (hangul_engine_shape): Fixed leaks + when the Hangul jamos length >= 6 (#95730). + 2002-10-14 Sven Neumann <sven@gimp.org> * modules/arabic/arabic-ft2.c (get_ruleset): unref the PangoOTInfo diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 2407f0f7..db6e1973 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2002-10-15 Changwoo Ryu <cwryu@debian.org> + + * modules/hangul/hangul-x.c (hangul_engine_shape): Fixed leaks + when the Hangul jamos length >= 6 (#95730). + 2002-10-14 Sven Neumann <sven@gimp.org> * modules/arabic/arabic-ft2.c (get_ruleset): unref the PangoOTInfo diff --git a/modules/hangul/hangul-x.c b/modules/hangul/hangul-x.c index b16ee1ac..070547b2 100644 --- a/modules/hangul/hangul-x.c +++ b/modules/hangul/hangul-x.c @@ -757,13 +757,14 @@ hangul_engine_shape (PangoFont *font, } if (n_jamos == jamos_max) { - gunichar2 *new_jamos; - jamos_max++; - new_jamos = g_new (gunichar2, jamos_max); - memcpy (new_jamos, jamos, n_jamos * sizeof (gunichar2)); - - jamos = new_jamos; + if (jamos == jamos_static) + { + jamos = g_new(gunichar2, jamos_max); + memcpy (jamos, jamos_static, n_jamos*sizeof(gunichar2)); + } + else + jamos = g_renew(gunichar2, jamos, jamos_max); } jamos[n_jamos++] = wc; } |