Commit Diff

Commit:
5ab1401ed4af9b945fd8f922808d6ecbd4ae8928
From:
Colin Leroy <colin@colino.net>
Date:
Message:
2004-08-10 [leroyc] 0.9.12cvs55.4 * src/common/socket.c Fix the possible race condition
Actions:
Patch | Tree
commit - dcf91e5545c7982007135e32b03e73e58a9e50d9
commit + 5ab1401ed4af9b945fd8f922808d6ecbd4ae8928
blob - a1c8c34ab54e8cb54b9553881df68a22d30ad064
blob + 92cad2905b34ee0933df212fc7a6e7c627d9f4fa
--- ChangeLog-gtk2.claws
+++ ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-08-10 [leroyc]	0.9.12cvs55.4
+
+	* src/common/socket.c
+		Fix the possible race condition
+
 2004-08-09 [paul]	0.9.12cvs55.3
 
 	* configure.ac
blob - d3aad81de559aa4f9c94da0c933191f86378e4b3
blob + 7e6f8b48b0297a453af72e27aaff061876152b9c
--- PATCHSETS
+++ PATCHSETS
@@ -111,3 +111,4 @@
 ( cvs diff -u -r 1.115.2.13 -r 1.115.2.14 src/main.c; cvs diff -u -r 1.9.2.4 -r 1.9.2.5 src/common/ssl.c; cvs diff -u -r 1.7.2.1 -r 1.7.2.2 src/common/sylpheed.c; cvs diff -u -r 1.5 -r 1.6 src/common/sylpheed.h; ) > 0.9.12cvs55.1.patchset
 ( cvs diff -u -r 1.4.2.2 -r 1.4.2.3 autogen.sh; cvs diff -u -r 1.654.2.140 -r 1.654.2.141 configure.ac; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 po/poconv.sh; ) > 0.9.12cvs55.2.patchset
 ( cvs diff -u -r 1.654.2.141 -r 1.654.2.142 configure.ac; cvs diff -u -r 1.155.2.8 -r 1.155.2.9 src/Makefile.am; cvs diff -u -r 1.24.2.3 -r 1.24.2.4 src/common/Makefile.am; ) > 0.9.12cvs55.3.patchset
+( cvs diff -u -r 1.13.2.7 -r 1.13.2.8 src/common/socket.c; ) > 0.9.12cvs55.4.patchset
blob - 148543c20aaa1d9c81188f15f26cd554964ad960
blob + c59cfec0d923f2647ee811a419a100af6af047d7
--- configure.ac
+++ configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=55
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.3
+EXTRA_GTK2_VERSION=.4
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
blob - 0512cf63d3fdfa4e4a94942cef77daa646834bb8
blob + 5081891cc20dc6b5db9603890de1ddfab8e96c1a
--- src/common/socket.c
+++ src/common/socket.c
@@ -623,6 +623,9 @@ static gboolean sock_connect_async_cb(GIOChannel *sour
 	gint len;
 	SockInfo *sockinfo;
 
+	if (conn_data->io_tag == 0 && conn_data->channel == NULL)
+		return FALSE;
+
 	fd = g_io_channel_unix_get_fd(source);
 
 	conn_data->io_tag = 0;