Use unsafe_unretained when weak reference system not guaranteed by deployment target

robbiehanson · robbiehanson · commit b18732ed7fc1 · 2012-04-02T13:01:55.000-07:00
diff --git a/GCD/GCDAsyncSocket.h b/GCD/GCDAsyncSocket.h
@@ -97,7 +97,11 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
 	uint32_t flags;
 	uint16_t config;
 	
+#if __has_feature(objc_arc_weak)
 	__weak id delegate;
+#else
+	__unsafe_unretained id delegate;
+#endif
 	dispatch_queue_t delegateQueue;
 	
 	int socket4FD;
diff --git a/GCD/GCDAsyncSocket.m b/GCD/GCDAsyncSocket.m
@@ -1595,7 +1595,7 @@ - (BOOL)doAccept:(int)parentSocketFD
 			
 			// Create GCDAsyncSocket instance for accepted socket
 			
-			GCDAsyncSocket *acceptedSocket = [[GCDAsyncSocket alloc] initWithDelegate:delegate
+			GCDAsyncSocket *acceptedSocket = [[GCDAsyncSocket alloc] initWithDelegate:theDelegate
 			                                                            delegateQueue:delegateQueue
 			                                                              socketQueue:childSocketQueue];
 			
@@ -4766,7 +4766,7 @@ - (void)completeCurrentRead
 	if (delegateQueue && [delegate respondsToSelector:@selector(socket:didReadData:withTag:)])
 	{
 		__strong id theDelegate = delegate;
-		GCDAsyncReadPacket *theRead = currentRead;
+		GCDAsyncReadPacket *theRead = currentRead; // Ensure currentRead retained since result may not own buffer
 		
 		dispatch_async(delegateQueue, ^{ @autoreleasepool {
 			
