Cleanup proxy connect reference when socket is opened asynchronously.

facebookincubator · Aug 22, 2016 · 02d04dc · 02d04dc
1 parent fb14fc1
commit 02d04dc
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/SocketRocket/SRWebSocket.m b/SocketRocket/SRWebSocket.m
@@ -326,8 +326,6 @@ - (void)open
 
 - (void)_connectionDoneWithError:(NSError *)error readStream:(NSInputStream *)readStream writeStream:(NSOutputStream *)writeStream
 {
-    _proxyConnect = nil; // Job's done! This is not longer required.
-
     if (error != nil) {
         [self _failWithError:error];
     } else {
@@ -350,6 +348,11 @@ - (void)_connectionDoneWithError:(NSError *)error readStream:(NSInputStream *)re
             });
         }
     }
+    // Schedule to run on a work queue, to make sure we don't run this inline and deallocate `self` inside `SRProxyConnect`.
+    // TODO: (nlutsenko) Find a better structure for this, maybe Bolts Tasks?
+    dispatch_async(_workQueue, ^{
+        _proxyConnect = nil;
+    });
 }
 
 - (BOOL)_checkHandshake:(CFHTTPMessageRef)httpMessage;