Merge pull request #1098 from tupleapp/client-failed-crash-fix

Fixed crash by adding a nil-pointer check.
ably · Apr 26, 2021 · eb87043 · eb87043
2 parents eaf1063 + 378f8da
commit eb87043
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Source/ARTRealtime.m b/Source/ARTRealtime.m
@@ -483,7 +483,10 @@ - (void)transition:(ARTRealtimeConnectionState)state withErrorInfo:(ARTErrorInfo
 
     [_internalEventEmitter emit:[ARTEvent newWithConnectionEvent:(ARTRealtimeConnectionEvent)state] with:stateChange];
 
-    [stateChangeEventListener startTimer];
+    // stateChangeEventListener may be nil if we're in a failed state
+    if (stateChangeEventListener != nil) {
+        [stateChangeEventListener startTimer];
+    }
 }
 
 - (void)transitionToDisconnectedOrSuspended {
@@ -511,7 +514,10 @@ - (void)updateWithErrorInfo:(nullable ARTErrorInfo *)errorInfo {
 
     ARTEventListener *stateChangeEventListener = [self transitionSideEffects:stateChange];
 
-    [stateChangeEventListener startTimer];
+    // stateChangeEventListener may be nil if we're in a failed state
+    if (stateChangeEventListener != nil) {
+        [stateChangeEventListener startTimer];
+    }
 }
 
 - (ARTEventListener *)transitionSideEffects:(ARTConnectionStateChange *)stateChange {