pidgin: 72d77bee: Patch from Andrew Gaul that fixes anothe...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 72d77bee8c7f8271071848c21432141e960014a5
Ancestor: a93bdafd934907a3dd4a80a4b12d4c0e1101fec6
Author: khc at pidgin.im
Date: 2008-06-08T22:18:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/72d77bee8c7f8271071848c21432141e960014a5

Modified files:
        pidgin/gtkimhtml.c

ChangeLog: 

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)


-------------- next part --------------
============================================================
--- pidgin/gtkimhtml.c	229b1520bcd54efd4a256fc03b22a09150e04c41
+++ pidgin/gtkimhtml.c	a78fce2e0e7bc0b2e96e3cedb940f8675a291008
@@ -5025,9 +5025,9 @@ static const gchar *tag_to_html_start(Gt
 			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 @@ static const gchar *tag_to_html_start(Gt
 			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);