diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-0 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-2 | 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/pango-markup.c | 7 |
8 files changed, 39 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2001-04-20 Anders Carlsson <andersca@codefactory.se> + + * pango/pango-markup.c (pango_parse_markup): Discard the parsed text if + the input variable text is NULL. This fixes a segfault. + Tue Apr 17 15:44:53 2001 Owen Taylor <otaylor@redhat.com> * Release 0.15 diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 5e16b50f..156b0d58 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,8 @@ +2001-04-20 Anders Carlsson <andersca@codefactory.se> + + * pango/pango-markup.c (pango_parse_markup): Discard the parsed text if + the input variable text is NULL. This fixes a segfault. + Tue Apr 17 15:44:53 2001 Owen Taylor <otaylor@redhat.com> * Release 0.15 diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 5e16b50f..156b0d58 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2001-04-20 Anders Carlsson <andersca@codefactory.se> + + * pango/pango-markup.c (pango_parse_markup): Discard the parsed text if + the input variable text is NULL. This fixes a segfault. + Tue Apr 17 15:44:53 2001 Owen Taylor <otaylor@redhat.com> * Release 0.15 diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 5e16b50f..156b0d58 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +2001-04-20 Anders Carlsson <andersca@codefactory.se> + + * pango/pango-markup.c (pango_parse_markup): Discard the parsed text if + the input variable text is NULL. This fixes a segfault. + Tue Apr 17 15:44:53 2001 Owen Taylor <otaylor@redhat.com> * Release 0.15 diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 5e16b50f..156b0d58 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +2001-04-20 Anders Carlsson <andersca@codefactory.se> + + * pango/pango-markup.c (pango_parse_markup): Discard the parsed text if + the input variable text is NULL. This fixes a segfault. + Tue Apr 17 15:44:53 2001 Owen Taylor <otaylor@redhat.com> * Release 0.15 diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 5e16b50f..156b0d58 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2001-04-20 Anders Carlsson <andersca@codefactory.se> + + * pango/pango-markup.c (pango_parse_markup): Discard the parsed text if + the input variable text is NULL. This fixes a segfault. + Tue Apr 17 15:44:53 2001 Owen Taylor <otaylor@redhat.com> * Release 0.15 diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 5e16b50f..156b0d58 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2001-04-20 Anders Carlsson <andersca@codefactory.se> + + * pango/pango-markup.c (pango_parse_markup): Discard the parsed text if + the input variable text is NULL. This fixes a segfault. + Tue Apr 17 15:44:53 2001 Owen Taylor <otaylor@redhat.com> * Release 0.15 diff --git a/pango/pango-markup.c b/pango/pango-markup.c index b6cbe2e7..97fb421a 100644 --- a/pango/pango-markup.c +++ b/pango/pango-markup.c @@ -601,8 +601,7 @@ pango_parse_markup (const char *markup_text, if (attr_list) md->attr_list = pango_attr_list_new (); - if (text) - md->text = g_string_new (""); + md->text = g_string_new (""); if (accel_char) *accel_char = 0; @@ -678,7 +677,9 @@ pango_parse_markup (const char *markup_text, if (text) *text = g_string_free (md->text, FALSE); - + else + g_string_free (md->text, TRUE); + if (accel_char) *accel_char = md->accel_char; |