Merge pull request facebookincubator#67 from tenthbitinc/master

Make closeWithCode:reason: safer by moving readyState change to work queue
rick147 · Jan 12, 2013 · 4a0996b · 4a0996b
2 parents 5f3e6e2 + c0a0539
commit 4a0996b
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/SocketRocket/SRWebSocket.m b/SocketRocket/SRWebSocket.m
@@ -625,16 +625,17 @@ - (void)close;
 - (void)closeWithCode:(NSInteger)code reason:(NSString *)reason;
 {
     assert(code);
-    if (self.readyState == SR_CLOSING || self.readyState == SR_CLOSED) {
-        return;
-    }
-
-    BOOL wasConnecting = self.readyState == SR_CONNECTING;
-
-    self.readyState = SR_CLOSING;
-
-    SRFastLog(@"Closing with code %d reason %@", code, reason);
     dispatch_async(_workQueue, ^{
+        if (self.readyState == SR_CLOSING || self.readyState == SR_CLOSED) {
+            return;
+        }
+
+        BOOL wasConnecting = self.readyState == SR_CONNECTING;
+
+        self.readyState = SR_CLOSING;
+
+        SRFastLog(@"Closing with code %d reason %@", code, reason);
+
         if (wasConnecting) {
             [self _disconnect];
             return;