# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1254120286 0
# Node ID 213a3449bb3ce5889d87a4599afa657e4e899a25
# Parent  160b864e3d9bcd061219c9de50186872033905c3# Parent  4c58aa4aacb02d5148a5e5230eee4b0f1ee08122
merge of 'ad95721f47b1dcb2d2e5c50c91701526fc4fd67f'
     and 'd3c619bb9b8fa811713cff87318d618e1c82de83'

diff -r 160b864e3d9b -r 213a3449bb3c libpurple/dnsquery.c
--- a/libpurple/dnsquery.c	Mon Sep 28 02:30:09 2009 +0000
+++ b/libpurple/dnsquery.c	Mon Sep 28 06:44:46 2009 +0000
@@ -328,6 +328,8 @@
 				printf("dns[%d] Error: getaddrinfo returned %d\n",
 					getpid(), rc);
 			dns_params.hostname[0] = '\0';
+			g_free(hostname);
+			hostname = NULL;
 			continue;
 		}
 		tmp = res;
@@ -948,6 +950,7 @@
 			g_snprintf(message, sizeof(message), _("Error resolving %s: %d"),
 					query_data->hostname, h_errno);
 			purple_dnsquery_failed(query_data, message);
+			g_free(hostname);
 			return FALSE;
 		}
 		memset(&sin, 0, sizeof(struct sockaddr_in));