diff options
| author | Padraig O'Briain <padraig.obriain@sun.com> | 2003-01-20 08:37:55 +0000 |
|---|---|---|
| committer | Padraig O'Briain <padraigo@src.gnome.org> | 2003-01-20 08:37:55 +0000 |
| commit | 5b06747fe1897ea55dae90acc7a188c162d0627b (patch) | |
| tree | 546324b2a254807d1f9912918a59411536c63929 | |
| parent | 553dd547c3478c7d72158b45f27f26b6ec6bd015 (diff) | |
| download | pango-5b06747fe1897ea55dae90acc7a188c162d0627b.tar.gz | |
Avoid crash with string such as " 12" (bug #103674)
2003-01-20 Padraig O'Briain <padraig.obriain@sun.com>
* pango/fonts.c (pango_font_description_from_string): Avoid crash
with string such as " 12" (bug #103674)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 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-- | pango/fonts.c | 2 |
6 files changed, 26 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2003-01-20 Padraig O'Briain <padraig.obriain@sun.com> + + * pango/fonts.c (pango_font_description_from_string): Avoid crash + with string such as " 12" (bug #103674) + Fri Dec 6 23:07:58 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (pango_xft_real_render) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 47fd7bba..caa74a6f 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2003-01-20 Padraig O'Briain <padraig.obriain@sun.com> + + * pango/fonts.c (pango_font_description_from_string): Avoid crash + with string such as " 12" (bug #103674) + Fri Dec 6 23:07:58 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (pango_xft_real_render) diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 47fd7bba..caa74a6f 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +2003-01-20 Padraig O'Briain <padraig.obriain@sun.com> + + * pango/fonts.c (pango_font_description_from_string): Avoid crash + with string such as " 12" (bug #103674) + Fri Dec 6 23:07:58 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (pango_xft_real_render) diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 47fd7bba..caa74a6f 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2003-01-20 Padraig O'Briain <padraig.obriain@sun.com> + + * pango/fonts.c (pango_font_description_from_string): Avoid crash + with string such as " 12" (bug #103674) + Fri Dec 6 23:07:58 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (pango_xft_real_render) diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 47fd7bba..caa74a6f 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2003-01-20 Padraig O'Briain <padraig.obriain@sun.com> + + * pango/fonts.c (pango_font_description_from_string): Avoid crash + with string such as " 12" (bug #103674) + Fri Dec 6 23:07:58 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (pango_xft_real_render) diff --git a/pango/fonts.c b/pango/fonts.c index 8b0c4e1a..03d5dfc1 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -865,7 +865,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) |