Adjust order of weakSelf

facebook · Sep 29, 2018 · 3a7d86d · 3a7d86d
1 parent 2d944ee
commit 3a7d86d
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/Libraries/WebSocket/RCTSRWebSocket.m b/Libraries/WebSocket/RCTSRWebSocket.m
@@ -1310,8 +1310,6 @@ - (void)_sendFrameWithOpcode:(RCTSROpCode)opcode data:(id)data;
 
 - (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode;
 {
-  __weak typeof(self) wself = self;
-
   if (_secure && !_pinnedCertFound && (eventCode == NSStreamEventHasBytesAvailable || eventCode == NSStreamEventHasSpaceAvailable)) {
     NSArray *sslCerts = _urlRequest.RCTSR_SSLPinnedCertificates;
     if (sslCerts) {
@@ -1343,8 +1341,17 @@ - (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode;
     }
   }
 
+  // _workQueue cannot be NULL
+  if (!_workQueue) {
+    return;
+  }
+  __weak typeof(self) weakSelf = self;
   dispatch_async(_workQueue, ^{
-    [wself safeHandleEvent:eventCode stream:aStream];
+    typeof(self) strongSelf = weakSelf;
+    if (!strongSelf) {
+      return;
+    }
+    [strongSelf safeHandleEvent:eventCode stream:aStream];
   });
 }