Don't eat Hangul when normalizing. (#301742, reported by Christian Biere,

2005-05-25  Matthias Clasen  <mclasen@redhat.com>

	* glib/gunidecomp.c (combine_hangul): Don't eat Hangul
	when normalizing.  (#301742, reported by Christian Biere,
	patch by Noah Levitt)

diff --git a/ChangeLog b/ChangeLog
index 31cd8657b8d13f2f008434ac96781974b80b238a..b3cde02b7a95040d0bff80165e621dc013bd77fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gunidecomp.c (combine_hangul): Don't eat Hangul 
+       when normalizing.  (#301742, reported by Christian Biere,
+       patch by Noah Levitt)
+
 2005-05-24  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (print_help): If the remaining argument

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 31cd8657b8d13f2f008434ac96781974b80b238a..b3cde02b7a95040d0bff80165e621dc013bd77fb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-05-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gunidecomp.c (combine_hangul): Don't eat Hangul 
+       when normalizing.  (#301742, reported by Christian Biere,
+       patch by Noah Levitt)
+
 2005-05-24  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (print_help): If the remaining argument

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 31cd8657b8d13f2f008434ac96781974b80b238a..b3cde02b7a95040d0bff80165e621dc013bd77fb 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2005-05-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gunidecomp.c (combine_hangul): Don't eat Hangul 
+       when normalizing.  (#301742, reported by Christian Biere,
+       patch by Noah Levitt)
+
 2005-05-24  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (print_help): If the remaining argument

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 31cd8657b8d13f2f008434ac96781974b80b238a..b3cde02b7a95040d0bff80165e621dc013bd77fb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-05-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gunidecomp.c (combine_hangul): Don't eat Hangul 
+       when normalizing.  (#301742, reported by Christian Biere,
+       patch by Noah Levitt)
+
 2005-05-24  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (print_help): If the remaining argument

diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c
index 3bef4c8b09e08361190960a2eb343ad21dad5cf2..fb3bf3dd97834dcb1d1f7ce79894855edf37cfd0 100644 (file)
--- a/glib/gunidecomp.c
+++ b/glib/gunidecomp.c
@@ -267,7 +267,7 @@ combine_hangul (gunichar a,
       return TRUE;
     }
   else if (0 <= SIndex && SIndex < SCount && (SIndex % TCount) == 0
-           && 0 <= TIndex && TIndex <= TCount)
+           && 0 < TIndex && TIndex < TCount)
     {
       *result = a + TIndex;
       return TRUE;