diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-09-15 19:56:02 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-09-15 19:56:02 +0000 |
| commit | 5f81d3ae5f627bd8c9afe7e393ac1905f82ef711 (patch) | |
| tree | dd7a27527d65b550b840b62a38a7fadb8dcb01f0 | |
| parent | 0bb8e3c03a4b0de57366cdde64a2b35cb55ed216 (diff) | |
| download | pango-5f81d3ae5f627bd8c9afe7e393ac1905f82ef711.tar.gz | |
Fix a g_assert() with a side-effect. (Maybe #121742?)
Tue Sep 9 12:21:02 2003 Owen Taylor <otaylor@redhat.com>
* pango/pangofc-fontmap.c (pango_fc_font_description_from_pattern):
Fix a g_assert() with a side-effect. (Maybe #121742?)
| -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/pangofc-fontmap.c | 4 |
6 files changed, 28 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Sep 9 12:21:02 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_font_description_from_pattern): + Fix a g_assert() with a side-effect. (Maybe #121742?) + Mon Sep 15 15:48:25 2003 Owen Taylor <otaylor@redhat.com> * examples/Makefile.am examples/argcontext.c examples/argcontext.h: diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index ffb672e5..82942340 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Tue Sep 9 12:21:02 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_font_description_from_pattern): + Fix a g_assert() with a side-effect. (Maybe #121742?) + Mon Sep 15 15:48:25 2003 Owen Taylor <otaylor@redhat.com> * examples/Makefile.am examples/argcontext.c examples/argcontext.h: diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index ffb672e5..82942340 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +Tue Sep 9 12:21:02 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_font_description_from_pattern): + Fix a g_assert() with a side-effect. (Maybe #121742?) + Mon Sep 15 15:48:25 2003 Owen Taylor <otaylor@redhat.com> * examples/Makefile.am examples/argcontext.c examples/argcontext.h: diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index ffb672e5..82942340 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Tue Sep 9 12:21:02 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_font_description_from_pattern): + Fix a g_assert() with a side-effect. (Maybe #121742?) + Mon Sep 15 15:48:25 2003 Owen Taylor <otaylor@redhat.com> * examples/Makefile.am examples/argcontext.c examples/argcontext.h: diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index ffb672e5..82942340 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Tue Sep 9 12:21:02 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_font_description_from_pattern): + Fix a g_assert() with a side-effect. (Maybe #121742?) + Mon Sep 15 15:48:25 2003 Owen Taylor <otaylor@redhat.com> * examples/Makefile.am examples/argcontext.c examples/argcontext.h: diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 78199339..ab8837f1 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -1016,10 +1016,12 @@ pango_fc_font_description_from_pattern (FcPattern *pattern, gboolean include_siz FcChar8 *s; int i; + FcResult res; desc = pango_font_description_new (); - g_assert (FcPatternGetString (pattern, FC_FAMILY, 0, (FcChar8 **) &s) == FcResultMatch); + res = FcPatternGetString (pattern, FC_FAMILY, 0, (FcChar8 **) &s); + g_assert (res == FcResultMatch); pango_font_description_set_family (desc, (gchar *)s); |