summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-06-21 15:43:19 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-06-21 15:43:19 +0000
commitd6c26a1e2a7f50df998bfa8181381a4eca1e555f (patch)
tree8a640edd286a936ed33ebb90c777b8c3d6dcc2ed
parent80fdebadc650f01c9c536583523c6386bac4f744 (diff)
downloadpango-d6c26a1e2a7f50df998bfa8181381a4eca1e555f.tar.gz
Fix leak when inserting an empty attributes. (#140771, Morten Welinder)
Mon Jun 21 11:41:18 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-attributes.c (pango_attr_list_change): Fix leak when inserting an empty attributes. (#140771, Morten Welinder)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--ChangeLog.pre-1-66
-rw-r--r--ChangeLog.pre-1-86
-rw-r--r--pango/pango-attributes.c5
5 files changed, 28 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d5743949..ba96d330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 21 11:41:18 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-attributes.c (pango_attr_list_change):
+ Fix leak when inserting an empty attributes. (#140771,
+ Morten Welinder)
+
Mon Jun 21 11:38:22 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (pango_context_set_font_map):
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index d5743949..ba96d330 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+Mon Jun 21 11:41:18 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-attributes.c (pango_attr_list_change):
+ Fix leak when inserting an empty attributes. (#140771,
+ Morten Welinder)
+
Mon Jun 21 11:38:22 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (pango_context_set_font_map):
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index d5743949..ba96d330 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+Mon Jun 21 11:41:18 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-attributes.c (pango_attr_list_change):
+ Fix leak when inserting an empty attributes. (#140771,
+ Morten Welinder)
+
Mon Jun 21 11:38:22 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (pango_context_set_font_map):
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index d5743949..ba96d330 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+Mon Jun 21 11:41:18 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-attributes.c (pango_attr_list_change):
+ Fix leak when inserting an empty attributes. (#140771,
+ Morten Welinder)
+
Mon Jun 21 11:38:22 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (pango_context_set_font_map):
diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
index 57017cb8..a8801948 100644
--- a/pango/pango-attributes.c
+++ b/pango/pango-attributes.c
@@ -972,7 +972,10 @@ pango_attr_list_change (PangoAttrList *list,
g_return_if_fail (list != NULL);
if (start_index == end_index) /* empty, nothing to do */
- return;
+ {
+ pango_attribute_destroy (attr);
+ return;
+ }
tmp_list = list->attributes;
prev = NULL;