summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-02-10 19:31:31 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-02-10 19:31:31 +0000
commit7b40f0d6d84d3c1205ff86c7c126dd91f4a5f5b6 (patch)
treea695af3ab5a7c9bf8b671c4fb556094da3259ead
parent6c518ebcdeae62bb7726a891b798cf1cd72e6bec (diff)
downloadpango-7b40f0d6d84d3c1205ff86c7c126dd91f4a5f5b6.tar.gz
Fix a leak of a font descriptor. (#131909, Kjartan Maraas, Christian
Tue Feb 10 14:28:41 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-context.c (update_attr_iterator): Fix a leak of a font descriptor. (#131909, Kjartan Maraas, Christian Persch)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-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-context.c2
6 files changed, 32 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a6ba35aa..8451fb3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 10 14:28:41 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-context.c (update_attr_iterator): Fix
+ a leak of a font descriptor. (#131909, Kjartan Maraas,
+ Christian Persch)
+
Tue Feb 10 14:13:04 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-tabs.c (pango_tab_array_resize): Fix
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index a6ba35aa..8451fb3c 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+Tue Feb 10 14:28:41 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-context.c (update_attr_iterator): Fix
+ a leak of a font descriptor. (#131909, Kjartan Maraas,
+ Christian Persch)
+
Tue Feb 10 14:13:04 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-tabs.c (pango_tab_array_resize): Fix
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index a6ba35aa..8451fb3c 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+Tue Feb 10 14:28:41 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-context.c (update_attr_iterator): Fix
+ a leak of a font descriptor. (#131909, Kjartan Maraas,
+ Christian Persch)
+
Tue Feb 10 14:13:04 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-tabs.c (pango_tab_array_resize): Fix
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index a6ba35aa..8451fb3c 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+Tue Feb 10 14:28:41 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-context.c (update_attr_iterator): Fix
+ a leak of a font descriptor. (#131909, Kjartan Maraas,
+ Christian Persch)
+
Tue Feb 10 14:13:04 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-tabs.c (pango_tab_array_resize): Fix
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index a6ba35aa..8451fb3c 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+Tue Feb 10 14:28:41 2004 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-context.c (update_attr_iterator): Fix
+ a leak of a font descriptor. (#131909, Kjartan Maraas,
+ Christian Persch)
+
Tue Feb 10 14:13:04 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-tabs.c (pango_tab_array_resize): Fix
diff --git a/pango/pango-context.c b/pango/pango-context.c
index fd55a20c..cfe18d21 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -539,6 +539,8 @@ update_attr_iterator (ItemizeState *state)
state->attr_end = state->end;
old_lang = state->lang;
+ if (state->font_desc)
+ pango_font_description_free (state->font_desc);
state->font_desc = pango_font_description_copy_static (state->context->font_desc);
pango_attr_iterator_get_font (state->attr_iter, state->font_desc,
&state->lang, &state->extra_attrs);