From 6bc2ee510aab6cf2d1f3769656ca158812c26dee Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Mon, 19 May 2003 15:54:48 +0000 Subject: [PATCH] Fix off-by-one error in g_unicode_canonical_ordering (bug #113260). 2003-05-19 Noah Levitt * glib/gunidecomp.c: Fix off-by-one error in g_unicode_canonical_ordering (bug #113260). --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gunidecomp.c | 10 +++++----- 7 files changed, 35 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22031c46..a44d97f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-05-19 Noah Levitt + + * glib/gunidecomp.c: Fix off-by-one error in + g_unicode_canonical_ordering (bug #113260). + 2003-05-19 Arafat Medini * ar.po: Added ar to ALL_LINGUAS diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 22031c46..a44d97f0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2003-05-19 Noah Levitt + + * glib/gunidecomp.c: Fix off-by-one error in + g_unicode_canonical_ordering (bug #113260). + 2003-05-19 Arafat Medini * ar.po: Added ar to ALL_LINGUAS diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 22031c46..a44d97f0 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2003-05-19 Noah Levitt + + * glib/gunidecomp.c: Fix off-by-one error in + g_unicode_canonical_ordering (bug #113260). + 2003-05-19 Arafat Medini * ar.po: Added ar to ALL_LINGUAS diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 22031c46..a44d97f0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2003-05-19 Noah Levitt + + * glib/gunidecomp.c: Fix off-by-one error in + g_unicode_canonical_ordering (bug #113260). + 2003-05-19 Arafat Medini * ar.po: Added ar to ALL_LINGUAS diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 22031c46..a44d97f0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2003-05-19 Noah Levitt + + * glib/gunidecomp.c: Fix off-by-one error in + g_unicode_canonical_ordering (bug #113260). + 2003-05-19 Arafat Medini * ar.po: Added ar to ALL_LINGUAS diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 22031c46..a44d97f0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2003-05-19 Noah Levitt + + * glib/gunidecomp.c: Fix off-by-one error in + g_unicode_canonical_ordering (bug #113260). + 2003-05-19 Arafat Medini * ar.po: Added ar to ALL_LINGUAS diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c index a2211e11..0d73bd5d 100644 --- a/glib/gunidecomp.c +++ b/glib/gunidecomp.c @@ -65,14 +65,14 @@ g_unicode_canonical_ordering (gunichar *string, { gsize j; /* Percolate item leftward through string. */ - for (j = i; j > 0; --j) + for (j = i + 1; j > 0; --j) { gunichar t; - if (COMBINING_CLASS (string[j]) <= next) + if (COMBINING_CLASS (string[j - 1]) <= next) break; - t = string[j + 1]; - string[j + 1] = string[j]; - string[j] = t; + t = string[j]; + string[j] = string[j - 1]; + string[j - 1] = t; swap = 1; } /* We're re-entering the loop looking at the old -- 2.34.1