rpms/pidgin/devel pidgin-2.5.1-gnomeproxy.patch, NONE, 1.1 pidgin.spec, 1.57, 1.58

[Stu Tomlinson]

Author: nosnilmot

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16548/devel

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.5.1-gnomeproxy.patch 
Log Message:
Fix a crash with GNOME proxy enabled (#461951)


pidgin-2.5.1-gnomeproxy.patch:

--- NEW FILE pidgin-2.5.1-gnomeproxy.patch ---
-----------------------------------------------------------------
Revision: f32f9fb19ff7b4685994c4120991d00386efee39
Ancestor: d8efe65e6fb17e66001bd2d37b7e05bf864e44cc
Author: nosnilmot at pidgin.im
Date: 2008-09-16T13:04:39
Branch: im.pidgin.pidgin

Modified files:
        libpurple/proxy.c

ChangeLog: 

Fix a double free. Fixes #7047

============================================================
--- libpurple/proxy.c	b7dbb41f68625d6ea47613e3198d6ddfe6d382a9
+++ libpurple/proxy.c	67a1948a059b1f6d1f69ac9a5c3aa6fba3a083c5
@@ -263,13 +263,17 @@ purple_gnome_proxy_get_info(void)
 		use_same_proxy = TRUE;
 	g_free(tmp);
 
-	if (!use_same_proxy && !g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_host",
+	if (!use_same_proxy) {
+		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_host",
 			&info.host, &err, NULL, NULL))
-		return purple_global_proxy_get_info();
-	g_free(err);
-	g_strchomp(info.host);
+			return purple_global_proxy_get_info();
+		g_free(err);
+	}
 
-	if (!use_same_proxy && *info.host != '\0') {
+	if(info.host != NULL)
+		g_strchomp(info.host);
+
+	if (!use_same_proxy && (info.host != NULL) && (*info.host != '\0')) {
 		info.type = PURPLE_PROXY_SOCKS5;
 		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_port",
 				&tmp, &err, NULL, NULL))


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- pidgin.spec	31 Aug 2008 16:06:20 -0000	1.57
+++ pidgin.spec	16 Sep 2008 13:25:16 -0000	1.58
@@ -29,7 +29,7 @@
 
 Name:		pidgin
 Version:	2.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -62,6 +62,7 @@
 Patch0: pidgin-2.4.2-reread-resolvconf.patch
 
 ## Patches 100+: To be Included in Future Upstream
+Patch100:       pidgin-2.5.1-gnomeproxy.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -291,6 +292,7 @@
 %patch0 -p1 -b .resolv
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p1 -b .gnomeproxy
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -500,6 +502,9 @@
 
 
 %changelog
+* Tue Sep 16 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-2
+- Fix a crash with GNOME proxy enabled (#461951)
+
 * Sun Aug 31 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-1
 - 2.5.1