rpms/pidgin/devel pidgin-2.6.3-msn_servconn_disconnect-crash.patch, NONE, 1.1 pidgin.spec, 1.98, 1.99

[Warren Togami 砥上勇]

Author: wtogami

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

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.6.3-msn_servconn_disconnect-crash.patch 
Log Message:
- Upstream backport:
    3abad7606f4a2dfd1903df796f33924b12509a56 msn_servconn_disconnect-crash


pidgin-2.6.3-msn_servconn_disconnect-crash.patch:
 servconn.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pidgin-2.6.3-msn_servconn_disconnect-crash.patch ---
(rediffed to apply against pidgin-2.6.3)
Revision: 3abad7606f4a2dfd1903df796f33924b12509a56
Ancestor: b4b3896d31eb6bef2433b251108f94dd5b04f06c
Author: sadrul at pidgin.im
Date: 2009-10-11T19:20:44
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msn/servconn.c

ChangeLog:

Swap two lines to fix a crash.

msn_servconn_disconnect can destroy servconn, which makes it crash on the
next line. So reset the idle-handler before going into that function.

--- libpurple/protocols/msn/servconn.c.orig	2009-10-19 14:06:02.437920569 -0400
+++ libpurple/protocols/msn/servconn.c	2009-10-19 14:06:33.318661341 -0400
@@ -299,8 +299,8 @@
 static gboolean
 servconn_idle_timeout_cb(MsnServConn *servconn)
 {
-	msn_servconn_disconnect(servconn);
 	servconn->timeout_handle = 0;
+	msn_servconn_disconnect(servconn);
 	return FALSE;
 }
 


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- pidgin.spec	16 Oct 2009 19:26:40 -0000	1.98
+++ pidgin.spec	19 Oct 2009 18:09:11 -0000	1.99
@@ -119,6 +119,7 @@ Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-
 Patch101: pidgin-2.6.2-yahoo-buddy-idle-time.patch
 Patch102: pidgin-2.6.2-yahoo-status-change-away.patch
 Patch103: pidgin-2.6.2-crash-validate-jid.patch
+Patch104: pidgin-2.6.3-msn_servconn_disconnect-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -379,6 +380,7 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %patch101 -p0 -b .yahoo-buddy-idle-time
 %patch102 -p0 -b .yahoo-status-change-away
 %patch103 -p0 -b .pidgin-2.6.2-crash-validate-jid
+%patch104 -p0 -b .msn_servconn_disconnect-crash
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -623,6 +625,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 19 2009 Warren Togami <wtogami at redhat.com> 2.6.3-2
+- Upstream backport:
+    3abad7606f4a2dfd1903df796f33924b12509a56 msn_servconn_disconnect-crash
+
 * Fri Oct 16 2009 Warren Togami <wtogami at redhat.com> 2.6.3-1
 - 2.6.3 CVE-2009-3615