Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

textlayout: avoid double-free when adding preedit color

Browse Source 
In add_preedit_attrs, don't free foreground/background colors already
set in the underlying text attributes (style).  They will be free'd by
release_style.

https://bugzilla.gnome.org/show_bug.cgi?id=703533
This commit is contained in:
Daiki Ueno
2013-07-03 19:03:30 +09:00
parent 50c3eb9acc
commit 837a0d3e40
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtktextlayout.c
View File

@@ -1887,6 +1887,11 @@ add_preedit_attrs (GtkTextLayout *layout,
continue;
pango_attr_iterator_get_font (iter, font_desc, &language, &extra_attrs);
if (appearance.rgba[0])
appearance.rgba[0] = gdk_rgba_copy (appearance.rgba[0]);
if (appearance.rgba[1])
appearance.rgba[1] = gdk_rgba_copy (appearance.rgba[1]);
tmp_list = extra_attrs;
while (tmp_list)
@@ -1947,6 +1952,11 @@ add_preedit_attrs (GtkTextLayout *layout,
attrs, start + offset,
size_only, TRUE);
if (appearance.rgba[0])
gdk_rgba_free (appearance.rgba[0]);
if (appearance.rgba[1])
gdk_rgba_free (appearance.rgba[1]);
pango_font_description_free (font_desc);
}
while (pango_attr_iterator_next (iter));