changeset 23323:8c315f969600

Patch from Andrew Gaul that fixes another leak: ==24860== 61,150 (15,900 direct, 45,250 indirect) bytes in 124 blocks are definitely lost in loss record 294 of 317 ==24860== at 0x4A07A7E: malloc (vg_replace_malloc.c:207) ==24860== by 0x331303F8A2: g_malloc (in /lib64/libglib-2.0.so.0.1600.3) ==24860== by 0x3313055397: g_slice_alloc (in /lib64/libglib-2.0.so.0.1600.3) ==24860== by 0x3BC001B0D9: gdk_color_copy (in /usr/lib64/libgdk-x11-2.0.so.0.1200.9) ==24860== by 0x3313408E2B: (within /lib64/libgobject-2.0.so.0.1600.3) ==24860== by 0x331340FC95: g_object_get_valist (in /lib64/libgobject-2.0.so.0.1600.3) ==24860== by 0x331340FF03: g_object_get (in /lib64/libgobject-2.0.so.0.1600.3) ==24860== by 0x47C1A1: tag_to_html_start (gtkimhtml.c:5023) ==24860== by 0x47C5EF: text_tag_data_new (gtkimhtml.c:5114) ==24860== by 0x47CA50: gtk_imhtml_get_markup_range (gtkimhtml.c:5198) ==24860== by 0x47CEF8: gtk_imhtml_get_markup (gtkimhtml.c:5314) ==24860== by 0x44BC3B: send_cb (gtkconv.c:548)
author Ka-Hing Cheung <khc@hxbc.us>
date Sun, 08 Jun 2008 22:18:14 +0000
parents 0d47aab4ca5c
children aec041e8f3e0 f06adc198c1d
files pidgin/gtkimhtml.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkimhtml.c	Sun Jun 08 21:59:54 2008 +0000
+++ b/pidgin/gtkimhtml.c	Sun Jun 08 22:18:14 2008 +0000
@@ -5025,9 +5025,9 @@
 			str += g_snprintf(str, sizeof(buf) - (str - buf),
 					"color: #%02x%02x%02x;",
 					color->red >> 8, color->green >> 8, color->blue >> 8);
-			gdk_color_free(color);
 			empty = FALSE;
 		}
+		gdk_color_free(color);
 
 		/* Background color */
 		g_object_get(obj, "background-set", &isset, "background-gdk", &color, NULL);
@@ -5035,9 +5035,9 @@
 			str += g_snprintf(str, sizeof(buf) - (str - buf),
 					"background: #%02x%02x%02x;",
 					color->red >> 8, color->green >> 8, color->blue >> 8);
-			gdk_color_free(color);
 			empty = FALSE;
 		}
+		gdk_color_free(color);
 
 		/* Underline */
 		g_object_get(obj, "underline-set", &isset, "underline", &ivalue, NULL);