summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-06-13 20:55:10 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-06-13 20:55:10 +0000
commit4f8ddf3fa34624db3d8421ae57ded895f62b168d (patch)
treeee2b3c4c2ed6c31b423fb65d58a293b283fcdd0d
parente593aab1113e90d857b8d82a2e824479b61fd347 (diff)
downloadpango-4f8ddf3fa34624db3d8421ae57ded895f62b168d.tar.gz
Fix problem with attr_list == NULL. (#85079, Andreas J. Guelzow)
Thu Jun 13 16:39:01 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-markup.c (pango_parse_markup): Fix problem with attr_list == NULL. (#85079, Andreas J. Guelzow)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--ChangeLog.pre-1-26
-rw-r--r--ChangeLog.pre-1-46
-rw-r--r--ChangeLog.pre-1-66
-rw-r--r--ChangeLog.pre-1-86
-rw-r--r--pango/pango-markup.c2
7 files changed, 38 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cc04f2b..3ccb1730 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 13 16:39:01 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-markup.c (pango_parse_markup):
+ Fix problem with attr_list == NULL. (#85079,
+ Andreas J. Guelzow)
+
Wed Jun 12 11:19:08 2002 Owen Taylor <otaylor@redhat.com>
* modules/tamil/tamil-x.c: Use unsigned char for
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 1cc04f2b..3ccb1730 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+Thu Jun 13 16:39:01 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-markup.c (pango_parse_markup):
+ Fix problem with attr_list == NULL. (#85079,
+ Andreas J. Guelzow)
+
Wed Jun 12 11:19:08 2002 Owen Taylor <otaylor@redhat.com>
* modules/tamil/tamil-x.c: Use unsigned char for
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 1cc04f2b..3ccb1730 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,9 @@
+Thu Jun 13 16:39:01 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-markup.c (pango_parse_markup):
+ Fix problem with attr_list == NULL. (#85079,
+ Andreas J. Guelzow)
+
Wed Jun 12 11:19:08 2002 Owen Taylor <otaylor@redhat.com>
* modules/tamil/tamil-x.c: Use unsigned char for
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 1cc04f2b..3ccb1730 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+Thu Jun 13 16:39:01 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-markup.c (pango_parse_markup):
+ Fix problem with attr_list == NULL. (#85079,
+ Andreas J. Guelzow)
+
Wed Jun 12 11:19:08 2002 Owen Taylor <otaylor@redhat.com>
* modules/tamil/tamil-x.c: Use unsigned char for
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 1cc04f2b..3ccb1730 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+Thu Jun 13 16:39:01 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-markup.c (pango_parse_markup):
+ Fix problem with attr_list == NULL. (#85079,
+ Andreas J. Guelzow)
+
Wed Jun 12 11:19:08 2002 Owen Taylor <otaylor@redhat.com>
* modules/tamil/tamil-x.c: Use unsigned char for
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 1cc04f2b..3ccb1730 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+Thu Jun 13 16:39:01 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-markup.c (pango_parse_markup):
+ Fix problem with attr_list == NULL. (#85079,
+ Andreas J. Guelzow)
+
Wed Jun 12 11:19:08 2002 Owen Taylor <otaylor@redhat.com>
* modules/tamil/tamil-x.c: Use unsigned char for
diff --git a/pango/pango-markup.c b/pango/pango-markup.c
index 23a88345..6ca773d7 100644
--- a/pango/pango-markup.c
+++ b/pango/pango-markup.c
@@ -598,6 +598,8 @@ pango_parse_markup (const char *markup_text,
*/
if (attr_list)
md->attr_list = pango_attr_list_new ();
+ else
+ md->attr_list = NULL;
md->text = g_string_new ("");