Bug fix from eldenchen: Fixed a crash problem (issue robbiehanson#62)

robbiehanson · robbiehanson · commit 899d99b652b2 · 2012-06-08T01:43:15.000-07:00
diff --git a/GCD/GCDAsyncSocket.m b/GCD/GCDAsyncSocket.m
@@ -2340,6 +2340,11 @@ - (BOOL)connectWithAddress4:(NSData *)address4 address6:(NSData *)address6 error
 		}
 	}
 	
+	// Prevent SIGPIPE signals
+	
+	int nosigpipe = 1;
+	setsockopt(socketFD, SOL_SOCKET, SO_NOSIGPIPE, &nosigpipe, sizeof(nosigpipe));
+	
 	// Start the connection process in a background queue
 	
 	int aConnectIndex = connectIndex;
@@ -2488,11 +2493,6 @@ - (void)didConnect:(int)aConnectIndex
 		return;
 	}
 	
-	// Prevent SIGPIPE signals
-	
-	int nosigpipe = 1;
-	setsockopt(socketFD, SOL_SOCKET, SO_NOSIGPIPE, &nosigpipe, sizeof(nosigpipe));
-	
 	// Setup our read/write sources
 	
 	[self setupReadAndWriteSourcesForNewlyConnectedSocket:socketFD];

Original file line number	Diff line number	Diff line change
`@@ -2340,6 +2340,11 @@ - (BOOL)connectWithAddress4:(NSData )address4 address6:(NSData )address6 error`
`2340`	`2340`	`}`
`2341`	`2341`	`}`
`2342`	`2342`
	`2343`	`+ // Prevent SIGPIPE signals`
	`2344`	`+`
	`2345`	`+ int nosigpipe = 1;`
	`2346`	`+ setsockopt(socketFD, SOL_SOCKET, SO_NOSIGPIPE, &nosigpipe, sizeof(nosigpipe));`
	`2347`	`+`
`2343`	`2348`	`// Start the connection process in a background queue`
`2344`	`2349`
`2345`	`2350`	`int aConnectIndex = connectIndex;`
`@@ -2488,11 +2493,6 @@ - (void)didConnect:(int)aConnectIndex`
`2488`	`2493`	`return;`
`2489`	`2494`	`}`
`2490`	`2495`
`2491`		`- // Prevent SIGPIPE signals`
`2492`		`-`
`2493`		`- int nosigpipe = 1;`
`2494`		`- setsockopt(socketFD, SOL_SOCKET, SO_NOSIGPIPE, &nosigpipe, sizeof(nosigpipe));`
`2495`		`-`
`2496`	`2496`	`// Setup our read/write sources`
`2497`	`2497`
`2498`	`2498`	`[self setupReadAndWriteSourcesForNewlyConnectedSocket:socketFD];`