Null checking completion blocks

ursachec · Apr 13, 2017 · a58ab52 · a58ab52
1 parent f7e7712
commit a58ab52
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/CPAProxy/CPAProxyManager.m b/CPAProxy/CPAProxyManager.m
@@ -279,7 +279,9 @@ - (void)handleInitialBootstrapProgressResponse:(NSString *)response
         __weak typeof(self)weakSelf = self;
         dispatch_async(self.callbackQueue, ^{
             __strong typeof(weakSelf)strongSelf = weakSelf;
-            strongSelf.progressBlock(progress,summaryString);
+            if (strongSelf.progressBlock) {
+                strongSelf.progressBlock(progress, summaryString);
+            }
         });
     }
 
@@ -294,10 +296,9 @@ - (void)handleInitialBootstrapProgressResponse:(NSString *)response
             __weak typeof(self)weakSelf = self;
             dispatch_async(self.callbackQueue, ^{
                 __strong typeof(weakSelf)strongSelf = weakSelf;
-                if (!strongSelf) {
-                    return;
+                if (strongSelf.completionBlock) {
+                    strongSelf.completionBlock(socksHost, socksPort, nil);
                 }
-                strongSelf.completionBlock(socksHost, socksPort, nil);
                 strongSelf.completionBlock = nil;
                 strongSelf.progressBlock = nil;
             });
@@ -338,7 +339,9 @@ - (void)failWithError:(NSError *)error
         __weak typeof(self)weakSelf = self;
         dispatch_async(self.callbackQueue, ^{
             __strong typeof(weakSelf)strongSelf = weakSelf;
-            strongSelf.completionBlock(nil,0,error);
+            if (strongSelf.completionBlock) {
+                strongSelf.completionBlock(nil, 0, error);
+            }
             strongSelf.completionBlock = nil;
             strongSelf.progressBlock = nil;
         });