From f33287b277ad7ba82ba5c0a4a43024d9f7b78fbb Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 8 Dec 2003 21:03:25 +0000 Subject: === Released 1.3.1 === Mon Dec 8 12:57:03 2003 Owen Taylor * === Released 1.3.1 === * NEWS: Further updates for 1.3.1 * pango/pango-script.c (pango_script_iter_next): Put in a hopefully-correct fix for a problem with invalid values of start_sp causing out-of-bounds writes. (#125928, Morten Welinder) --- ChangeLog | 15 +++++++++++---- ChangeLog.pre-1-10 | 15 +++++++++++---- ChangeLog.pre-1-4 | 15 +++++++++++---- ChangeLog.pre-1-6 | 15 +++++++++++---- ChangeLog.pre-1-8 | 15 +++++++++++---- NEWS | 9 ++++++++- pango/pango-script.c | 6 ++++-- 7 files changed, 67 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b1e421e..94ce981f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Mon Dec 8 12:57:03 2003 Owen Taylor + + * === Released 1.3.1 === + + * NEWS: Further updates for 1.3.1 + + * pango/pango-script.c (pango_script_iter_next): Put in + a hopefully-correct fix for a problem with invalid values of + start_sp causing out-of-bounds writes. (#125928, + Morten Welinder) + 2003-12-07 Tor Lillqvist * pango/Makefile.am: Fix problems when building outside srcdir for @@ -71,10 +82,6 @@ FcCharSetHasChar(). This allows to use PangoFT2 with all font encodings supported by fontconfig and fixes bug #101856. -Sat Nov 15 16:03:30 2003 Owen Taylor - - * === Released 1.3.1 === - Wed Nov 12 16:11:47 2003 Owen Taylor * configure.in: Version 1.3.1, interface age 1. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 5b1e421e..94ce981f 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,14 @@ +Mon Dec 8 12:57:03 2003 Owen Taylor + + * === Released 1.3.1 === + + * NEWS: Further updates for 1.3.1 + + * pango/pango-script.c (pango_script_iter_next): Put in + a hopefully-correct fix for a problem with invalid values of + start_sp causing out-of-bounds writes. (#125928, + Morten Welinder) + 2003-12-07 Tor Lillqvist * pango/Makefile.am: Fix problems when building outside srcdir for @@ -71,10 +82,6 @@ FcCharSetHasChar(). This allows to use PangoFT2 with all font encodings supported by fontconfig and fixes bug #101856. -Sat Nov 15 16:03:30 2003 Owen Taylor - - * === Released 1.3.1 === - Wed Nov 12 16:11:47 2003 Owen Taylor * configure.in: Version 1.3.1, interface age 1. diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 5b1e421e..94ce981f 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,14 @@ +Mon Dec 8 12:57:03 2003 Owen Taylor + + * === Released 1.3.1 === + + * NEWS: Further updates for 1.3.1 + + * pango/pango-script.c (pango_script_iter_next): Put in + a hopefully-correct fix for a problem with invalid values of + start_sp causing out-of-bounds writes. (#125928, + Morten Welinder) + 2003-12-07 Tor Lillqvist * pango/Makefile.am: Fix problems when building outside srcdir for @@ -71,10 +82,6 @@ FcCharSetHasChar(). This allows to use PangoFT2 with all font encodings supported by fontconfig and fixes bug #101856. -Sat Nov 15 16:03:30 2003 Owen Taylor - - * === Released 1.3.1 === - Wed Nov 12 16:11:47 2003 Owen Taylor * configure.in: Version 1.3.1, interface age 1. diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 5b1e421e..94ce981f 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,14 @@ +Mon Dec 8 12:57:03 2003 Owen Taylor + + * === Released 1.3.1 === + + * NEWS: Further updates for 1.3.1 + + * pango/pango-script.c (pango_script_iter_next): Put in + a hopefully-correct fix for a problem with invalid values of + start_sp causing out-of-bounds writes. (#125928, + Morten Welinder) + 2003-12-07 Tor Lillqvist * pango/Makefile.am: Fix problems when building outside srcdir for @@ -71,10 +82,6 @@ FcCharSetHasChar(). This allows to use PangoFT2 with all font encodings supported by fontconfig and fixes bug #101856. -Sat Nov 15 16:03:30 2003 Owen Taylor - - * === Released 1.3.1 === - Wed Nov 12 16:11:47 2003 Owen Taylor * configure.in: Version 1.3.1, interface age 1. diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 5b1e421e..94ce981f 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,14 @@ +Mon Dec 8 12:57:03 2003 Owen Taylor + + * === Released 1.3.1 === + + * NEWS: Further updates for 1.3.1 + + * pango/pango-script.c (pango_script_iter_next): Put in + a hopefully-correct fix for a problem with invalid values of + start_sp causing out-of-bounds writes. (#125928, + Morten Welinder) + 2003-12-07 Tor Lillqvist * pango/Makefile.am: Fix problems when building outside srcdir for @@ -71,10 +82,6 @@ FcCharSetHasChar(). This allows to use PangoFT2 with all font encodings supported by fontconfig and fixes bug #101856. -Sat Nov 15 16:03:30 2003 Owen Taylor - - * === Released 1.3.1 === - Wed Nov 12 16:11:47 2003 Owen Taylor * configure.in: Version 1.3.1, interface age 1. diff --git a/NEWS b/NEWS index 6219871c..5aa9bded 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,14 @@ Overview of changes between 1.3.0 and 1.3.1 =========================================== +* Support non-Unicode font encodings when supported by fontconfig + [Sven Neumann] +* Draw 6-digit hex boxes for > U+FFFF [Noah Levitt] +* Update to latest fribidi [Noah] +* Honor U+2028 LINE SEPARATOR [Noah] * Fix a problem with iteration by chars [Mariano Suárez-Alvarez] -* Misc bug and build fixes [Martin Kretzschmar, Padraig O'Briain] +* Misc bug and build fixes [Jeff Bonggren, Martin Kretzschmar, + Noah, Sven Neumann, Padraig O'Briain, Manish Singh, + Morten Welinder] * Fix header file includes to work with recent FreeType. Overview of changes between 1.2.x and 1.3.0 diff --git a/pango/pango-script.c b/pango/pango-script.c index c489a2e7..0de2edaa 100644 --- a/pango/pango-script.c +++ b/pango/pango-script.c @@ -327,10 +327,12 @@ pango_script_iter_next (PangoScriptIter *iter) * if this character is a close paired character, * pop it from the stack */ - if (pair_index >= 0 && !IS_OPEN (pair_index) != 0 && iter->paren_sp >= 0) + if (pair_index >= 0 && !IS_OPEN (pair_index) && iter->paren_sp >= 0) { iter->paren_sp--; - start_sp--; + + if (iter->paren_sp < start_sp) + start_sp = iter->paren_sp; } } else -- cgit v1.2.1