Fixed potential crash on reachability status check

belkevich · Jan 16, 2016 · 5a12ccd · 5a12ccd
1 parent 6115225
commit 5a12ccd
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Classes/Public/SCNetworkReachability.m b/Classes/Public/SCNetworkReachability.m
@@ -21,8 +21,8 @@ @interface SCNetworkReachability ()
 
 @property (atomic, assign) BOOL isStatusValid;
 @property (atomic, assign) SCNetworkStatus status;
+@property (atomic, copy) void (^statusBlock)(SCNetworkStatus status);
 @property (nonatomic, copy) void (^observationBlock)(SCNetworkStatus status);
-@property (nonatomic, copy) void (^statusBlock)(SCNetworkStatus status);
 @end
 
 @implementation SCNetworkReachability
@@ -111,7 +111,8 @@ - (void)reachabilityStatusOnDispatchQueue:(dispatch_queue_t)queue
         [self updateStatusBlockWithDispatchQueue:queue block:block];
         if (self.isStatusValid)
         {
-            self.statusBlock(self.status);
+            safe_block(self.statusBlock, self.status);
+            self.statusBlock = nil;
         }
     }
 }
@@ -136,7 +137,7 @@ - (void)updateStatusBlockWithDispatchQueue:(dispatch_queue_t)queue
 {
     if (self.statusBlock)
     {
-        void (^previousBlock)(SCNetworkStatus status) = self.statusBlock;
+        void (^previousBlock)(SCNetworkStatus) = self.statusBlock;
         self.statusBlock = ^(SCNetworkStatus status)
         {
             previousBlock(status);