pidgin.2.6.3: eb45a19a: *** Plucked rev ff8f05c45f3ff64c9fa0b6cf...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: eb45a19a6262186aa86867e6e80e64c65714329a
Ancestor: c8d72361e5c9828c476ac5cb94f17584b1f407f9
Author: markdoliner at pidgin.im
Date: 2009-10-16T09:21:03
Branch: im.pidgin.pidgin.2.6.3
URL: http://d.pidgin.im/viewmtn/revision/info/eb45a19a6262186aa86867e6e80e64c65714329a

Modified files:
        COPYRIGHT ChangeLog libpurple/dnsquery.c

ChangeLog: 

*** Plucked rev ff8f05c45f3ff64c9fa0b6cfeaa6c7e44983bf38 (darkrain42 at pidgin.im):
More tightly scope a variable and avoid trying to free an unset variable.

Patch from Brian Lu. Closes #10242.


-------------- next part --------------
============================================================
--- COPYRIGHT	7bf3d16ae290ed74998994b7365751eaf9849a07
+++ COPYRIGHT	8259751745ac2946fb8f021227aea2365d979666
@@ -275,6 +275,7 @@ Shlomi Loubaton
 Lokheed
 Norberto Lopes
 Shlomi Loubaton
+Brian Lu
 Uli Luckas
 Matthew Luckie
 Marcus Lundblad
============================================================
--- ChangeLog	5d51169d4112dd8cce3d8940b079d8a4438fb805
+++ ChangeLog	0ea7799165e6dbaf9afa3b9309cfbd31d80ae838
@@ -1,6 +1,10 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-versoin 2.6.3 (10/16/2009):
+version 2.6.3 (10/16/2009):
+	General:
+	* Fix a crash when performing DNS queries on Unixes that use the
+	  blocking DNS lookups.  (Brian Lu)
+
 	AIM and ICQ:
 	* Fix a crash when some clients send contacts in a format we don't
 	  understand.
============================================================
--- libpurple/dnsquery.c	f48c115bd2165c4a63a1f9b47ccc459c748bf4ba
+++ libpurple/dnsquery.c	be44ed4ded20b86f084e483193f56bad11f0b710
@@ -918,7 +918,6 @@ resolve_host(gpointer data)
 	PurpleDnsQueryData *query_data;
 	struct sockaddr_in sin;
 	GSList *hosts = NULL;
-	char *hostname;
 
 	query_data = data;
 	query_data->timeout = 0;
@@ -931,6 +930,7 @@ resolve_host(gpointer data)
 
 	if (!inet_aton(query_data->hostname, &sin.sin_addr)) {
 		struct hostent *hp;
+		gchar *hostname;
 #ifdef USE_IDN
 		if (!dns_str_is_ascii(query_data->hostname)) {
 			int ret = purple_network_convert_idn_to_ascii(query_data->hostname,
@@ -956,11 +956,11 @@ resolve_host(gpointer data)
 		memset(&sin, 0, sizeof(struct sockaddr_in));
 		memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
 		sin.sin_family = hp->h_addrtype;
+		g_free(hostname);
 	} else
 		sin.sin_family = AF_INET;
 	sin.sin_port = htons(query_data->port);
 
-	g_free(hostname);
 	hosts = g_slist_append(hosts, GINT_TO_POINTER(sizeof(sin)));
 	hosts = g_slist_append(hosts, g_memdup(&sin, sizeof(sin)));