From 09fcd2717629354eebb5e79c75901ae58d52b21d Mon Sep 17 00:00:00 2001 From: Padraig O'Briain Date: Mon, 20 Jan 2003 08:44:28 +0000 Subject: Avoid crash with string such as " 12" (bug #103674) 2003-01-20 Padraig O'Briain * pango/fonts.c (pango_font_description_from_string): Avoid crash with string such as " 12" (bug #103674) --- ChangeLog | 5 +++++ ChangeLog.pre-1-10 | 5 +++++ ChangeLog.pre-1-4 | 5 +++++ ChangeLog.pre-1-6 | 5 +++++ ChangeLog.pre-1-8 | 5 +++++ pango/fonts.c | 2 +- 6 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5fd99d48..0d94bc3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-01-20 Padraig O'Briain + + * pango/fonts.c (pango_font_description_from_string): Avoid crash + with string such as " 12" (bug #103674) + Fri Jan 10 18:56:36 2003 Owen Taylor * pango/opentype/ftxgdef.c: Export TT_New_GDEF_Table diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 5fd99d48..0d94bc3e 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2003-01-20 Padraig O'Briain + + * pango/fonts.c (pango_font_description_from_string): Avoid crash + with string such as " 12" (bug #103674) + Fri Jan 10 18:56:36 2003 Owen Taylor * pango/opentype/ftxgdef.c: Export TT_New_GDEF_Table diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 5fd99d48..0d94bc3e 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +2003-01-20 Padraig O'Briain + + * pango/fonts.c (pango_font_description_from_string): Avoid crash + with string such as " 12" (bug #103674) + Fri Jan 10 18:56:36 2003 Owen Taylor * pango/opentype/ftxgdef.c: Export TT_New_GDEF_Table diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 5fd99d48..0d94bc3e 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2003-01-20 Padraig O'Briain + + * pango/fonts.c (pango_font_description_from_string): Avoid crash + with string such as " 12" (bug #103674) + Fri Jan 10 18:56:36 2003 Owen Taylor * pango/opentype/ftxgdef.c: Export TT_New_GDEF_Table diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 5fd99d48..0d94bc3e 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2003-01-20 Padraig O'Briain + + * pango/fonts.c (pango_font_description_from_string): Avoid crash + with string such as " 12" (bug #103674) + Fri Jan 10 18:56:36 2003 Owen Taylor * pango/opentype/ftxgdef.c: Export TT_New_GDEF_Table diff --git a/pango/fonts.c b/pango/fonts.c index 07b248d7..18323596 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -864,7 +864,7 @@ pango_font_description_from_string (const char *str) while (last > str && g_ascii_isspace (*(last - 1))) last--; - while (g_ascii_isspace (*str)) + while (last > str && g_ascii_isspace (*str)) str++; if (str != last) -- cgit v1.2.1