DEVEX-774 Fix Infer analyzer warnings. (#860)

E-B-Smith · web-flow · commit 12a066b0f16c · 2018-09-11T13:16:48.000-07:00
diff --git a/Branch-SDK/Branch-SDK/BNCApplication.m b/Branch-SDK/Branch-SDK/BNCApplication.m
@@ -101,7 +101,7 @@ + (NSDate*) firstInstallBuildDate {
         forService:kBranchKeychainService
         key:kBranchKeychainFirstBuildKey
         cloudAccessGroup:nil];
-
+    if (error) BNCLogError(@"Keychain store: %@.", error);
     return firstBuildDate;
 }
 
@@ -136,7 +136,7 @@ + (NSDate*) firstInstallDate {
         forService:kBranchKeychainService
         key:kBranchKeychainFirstInstalldKey
         cloudAccessGroup:nil];
-
+    if (error) BNCLogError(@"Keychain store: %@.", error);
     return firstInstallDate;
 }
 
diff --git a/Branch-SDK/Branch-SDK/BNCDebug.m b/Branch-SDK/Branch-SDK/BNCDebug.m
@@ -93,7 +93,7 @@ BOOL BNCDebuggerIsAttached() {
 
     uint count = 0;
     Ivar *ivars = class_copyIvarList(class, &count);
-    for (uint i = 0; i < count; ++i) {
+    for (uint i = 0; ivars && i < count; ++i) {
         const char* encoding = ivar_getTypeEncoding(ivars[i]);
         const char* ivarName = ivar_getName(ivars[i]);
         const void* ivarPtr = nil;
@@ -174,7 +174,7 @@ BOOL BNCDebuggerIsAttached() {
 
     count = 0;
     objc_property_t *properties = class_copyPropertyList(class, &count);
-    for (int i = 0; i < count; ++i)
+    for (int i = 0; properties && i < count; ++i)
         [result appendFormat:@"\tProperty name: '%s'.\n", property_getName(properties[i])];
     if (properties) free(properties);
 
diff --git a/Branch-SDK/Branch-SDK/BNCEncodingUtils.m b/Branch-SDK/Branch-SDK/BNCEncodingUtils.m
@@ -439,7 +439,7 @@ + (NSData *) dataFromHexString:(NSString*)string {
     int highValue = -1;
     const uint8_t *p = (const uint8_t*) [inputData bytes];
     for (NSUInteger i = 0; i < inputData.length; ++i) {
-        int value = -1;
+        int value;
         if (*p >= '0' && *p <= '9')
             value = *p - '0';
         else
diff --git a/Branch-SDK/Branch-SDK/BNCLog.m b/Branch-SDK/Branch-SDK/BNCLog.m
@@ -428,9 +428,8 @@ BOOL BNCLogByteWrapOpenURL_Internal(NSURL *url, long maxBytes) {
     NSString *record = BNCLogByteWrapReadNextRecord();
     while (record) {
         NSDate *date = nil;
-        NSString *dateString = @"";
         if (record.length >= 27) {
-            dateString = [record substringWithRange:NSMakeRange(0, 27)];
+            NSString *dateString = [record substringWithRange:NSMakeRange(0, 27)];
             date = [bnc_LogDateFormatter dateFromString:dateString];
         }
         if (!date || [date compare:lastDate] < 0) {
diff --git a/Branch-SDK/Branch-SDK/BNCSpotlightService.m b/Branch-SDK/Branch-SDK/BNCSpotlightService.m
@@ -133,37 +133,31 @@ - (void)indexContentWithBranchUniversalObject:(BranchUniversalObject*)universalO
                                       completion(url,error);
                               }];
         
-    }else {
-        
+    } else {
+
+        __weak __typeof(self) weakSelf = self;
         [universalObject getShortUrlWithLinkProperties:linkProperty
-                                           andCallback:^(NSString * _Nullable url, NSError * _Nullable error) {
-                                               if (error) {
-                                                   if (completion) {
-                                                       completion([BNCPreferenceHelper preferenceHelper].userUrl, error);
-                                                   }
-                                               }else {
-                                                   id attributes = [self attributeSetWithUniversalObject:universalObject
-                                                                                               thumbnail:thumbnailData
-                                                                                                     url:url];
-                                                   NSDictionary *indexingParams = @{@"title": universalObject.title,
-                                                                                    @"url": url,
-                                                                                    @"spotlightId": url,
-                                                                                    @"userInfo": [universalObject.contentMetadata.customMetadata mutableCopy],
-                                                                                    @"keywords": [NSSet setWithArray:universalObject.keywords],
-                                                                                    @"attributeSet": attributes
-                                                                                    };
-                                                   [self indexUsingNSUserActivity:indexingParams];
-                                                   
-                                                   // Not handling error scenarios because they are already handled upstream by the caller
-                                                   if (url) {
-                                                       if (completion) {
-                                                           completion(url, nil);
-                                                       }
-                                                   }
-                                               }
-                                           }];
+            andCallback:^(NSString * _Nullable url, NSError * _Nullable error) {
+                __strong __typeof(self) strongSelf = weakSelf;
+                if (!strongSelf || !url || error) {
+                    if (completion) completion([BNCPreferenceHelper preferenceHelper].userUrl, error);
+                    return;
+                }
+            id attributes =
+                [strongSelf attributeSetWithUniversalObject:universalObject thumbnail:thumbnailData url:url];
+            NSMutableDictionary *indexingParams = [NSMutableDictionary new];
+            indexingParams[@"title"] = universalObject.title;
+            indexingParams[@"url"] = url;
+            indexingParams[@"spotlightId"] = url;
+            indexingParams[@"userInfo"] = [universalObject.contentMetadata.customMetadata mutableCopy];
+            indexingParams[@"keywords"] = [NSSet setWithArray:universalObject.keywords];
+            indexingParams[@"attributeSet"] = attributes;
+            [self indexUsingNSUserActivity:indexingParams];
+            if (completion) completion(url, nil);
+            }
+        ];
+
     }
-    
 }
 
 - (id)attributeSetWithUniversalObject:(BranchUniversalObject*)universalObject
@@ -417,7 +411,7 @@ - (void)removeSearchableItemsWithIdentifier:(NSString * _Nonnull)identifier
     if (identifier == nil) {
         NSError *error = [NSError branchErrorWithCode:BNCSpotlightIdentifierError
                                      localizedMessage:@"Spotlight indentifier not available"];
-        completion(error);
+        if (completion) completion(error);
         return;
     }
     [self removeSearchableItemsWithIdentifiers:@[identifier] callback:^(NSError * _Nullable error) {
diff --git a/Branch-SDK/Branch-SDK/Branch.m b/Branch-SDK/Branch-SDK/Branch.m
@@ -142,7 +142,7 @@ @interface Branch() <BranchDeepLinkingControllerCompletionDelegate, FABKit> {
 @property (assign, nonatomic) BOOL useCookieBasedMatching;
 @property (strong, nonatomic) NSDictionary *deepLinkDebugParams;
 @property (assign, nonatomic) BOOL accountForFacebookSDK;
-@property (assign, nonatomic) id FBSDKAppLinkUtility;
+@property (strong, nonatomic) id FBSDKAppLinkUtility;
 @property (assign, nonatomic) BOOL delayForAppleAds;
 @property (assign, nonatomic) BOOL searchAdsDebugMode;
 @property (strong, nonatomic) NSMutableArray *whiteListedSchemeList;
@@ -1569,15 +1569,15 @@ - (void)indexOnSpotlightWithBranchUniversalObject:(BranchUniversalObject*)univer
 
     if (!universalObject) {
         NSError* error = [NSError branchErrorWithCode:BNCInitError localizedMessage:@"Branch Universal Object is nil"];
-        completion(universalObject,nil,error);
+        if (completion) completion(universalObject,nil,error);
         return;
     } else {
         [spotlightService indexWithBranchUniversalObject:universalObject
                                           linkProperties:linkProperties
                                                 callback:^(BranchUniversalObject * _Nullable universalObject,
                                                            NSString * _Nullable url,
                                                            NSError * _Nullable error) {
-                                              completion(universalObject,url,error);
+                                              if (completion) completion(universalObject,url,error);
                                           }];
     }
 }
@@ -1595,8 +1595,7 @@ - (void)indexOnSpotlightUsingSearchableItems:(NSArray<BranchUniversalObject*>* )
     [spotlight indexPrivatelyWithBranchUniversalObjects:universalObjects
                                              completion:^(NSArray<BranchUniversalObject *> * _Nullable universalObjects,
                                                           NSError * _Nullable error) {
-                                                 if (completion)
-                                                     completion(universalObjects,error);
+                                                 if (completion) completion(universalObjects,error);
                                              }];
 }
 
@@ -1611,8 +1610,7 @@ - (void)removeSearchableItemWithBranchUniversalObject:(BranchUniversalObject *)u
                                                          andAlias:nil];
     [spotlight removeSearchableItemsWithIdentifier:dynamicUrl
                                           callback:^(NSError * _Nullable error) {
-                                              if (completion)
-                                                  completion(error);
+                                              if (completion) completion(error);
                                           }];
 }
 
@@ -1969,10 +1967,12 @@ - (void)insertRequestAtFront:(BNCServerRequest *)req {
 }
 
 static inline void BNCPerformBlockOnMainThreadSync(dispatch_block_t block) {
-    if ([NSThread isMainThread]) {
-        block();
-    } else {
-        dispatch_sync(dispatch_get_main_queue(), block);
+    if (block) {
+        if ([NSThread isMainThread]) {
+            block();
+        } else {
+            dispatch_sync(dispatch_get_main_queue(), block);
+        }
     }
 }
 
diff --git a/Branch-SDK/Branch-SDK/BranchUniversalObject.m b/Branch-SDK/Branch-SDK/BranchUniversalObject.m
@@ -608,7 +608,7 @@ - (void) removeFromSpotlightWithCallback:(void (^_Nullable)(NSError * _Nullable
     } else {
         NSError *error = [NSError branchErrorWithCode:BNCSpotlightPublicIndexError
                                      localizedMessage:@"Publically indexed cannot be removed from Spotlight"];
-        completion(error);
+        if (completion) completion(error);
     }
 }
 
diff --git a/Branch-SDK/Branch-SDK/Networking/BNCServerInterface.m b/Branch-SDK/Branch-SDK/Networking/BNCServerInterface.m
@@ -468,7 +468,7 @@ - (void)getRequest:(NSDictionary *)params
 
     [self genericHTTPRequest:request retryNumber:retryNumber callback:callback
         retryHandler:^NSURLRequest *(NSInteger lastRetryNumber) {
-            return [self prepareGetRequest:params url:url key:key retryNumber:++lastRetryNumber];
+            return [self prepareGetRequest:params url:url key:key retryNumber:lastRetryNumber+1];
     }];
 }
 
@@ -510,7 +510,7 @@ - (void)postRequest:(NSDictionary *)post
                  retryNumber:retryNumber
                     callback:callback
                 retryHandler:^ NSURLRequest *(NSInteger lastRetryNumber) {
-        return [self preparePostRequest:extendedParams url:url key:key retryNumber:++lastRetryNumber];
+        return [self preparePostRequest:extendedParams url:url key:key retryNumber:lastRetryNumber+1];
     }];
 }
 
@@ -834,8 +834,7 @@ - (void)updateDeviceInfoToMutableDictionary:(NSMutableDictionary *)dict {
     NSString *hardwareId = [deviceInfo.hardwareId copy];
     NSString *hardwareIdType = [deviceInfo.hardwareIdType copy];
     NSNumber *isRealHardwareId = @(deviceInfo.isRealHardwareId);
-
-    if (hardwareId && hardwareIdType && isRealHardwareId) {
+    if (hardwareId != nil && hardwareIdType != nil && isRealHardwareId != nil) {
         dict[BRANCH_REQUEST_KEY_HARDWARE_ID] = hardwareId;
         dict[BRANCH_REQUEST_KEY_HARDWARE_ID_TYPE] = hardwareIdType;
         dict[BRANCH_REQUEST_KEY_IS_HARDWARE_ID_REAL] = isRealHardwareId;
diff --git a/scripts/xcode-analyze-infer b/scripts/xcode-analyze-infer
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -euo pipefail
+
+# xcode-analyze-infer - Runs the Infer code analyzer on an Xcode project.
+#
+# Run from the root directory of the project.
+#
+# Installation
+# ------------
+# brew install infer
+# gem install xcpretty
+
+function clean_up() {
+    set +e
+    rm compile_commands.json
+    rm -Rf infer-out/
+    rm xcodebuild.log
+}
+trap clean_up EXIT
+
+xcodebuild | tee xcodebuild.log
+xcpretty -r json-compilation-database -o compile_commands.json < xcodebuild.log > /dev/null
+infer run --skip-analysis-in-path Pods --clang-compilation-db-files-escaped compile_commands.json
+temp_file=$(mktemp)
+cat infer-out/bugs.txt > $temp_file
+$EDITOR $temp_file
diff --git a/scripts/xcode-nuke-clean b/scripts/xcode-nuke-clean
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+#  xcode-nuke-clean  -  Nuclear clean for an xcode project.
+#
+#  EB Smith, July 2015
+
+rm -Rf build
+rm -Rf Build
+rm -Rf ~/Library/Developer/Xcode/DerivedData
+

Original file line number	Diff line number	Diff line change
`@@ -608,7 +608,7 @@ - (void) removeFromSpotlightWithCallback:(void (^_Nullable)(NSError * _Nullable`
`608`	`608`	`} else {`
`609`	`609`	`NSError *error = [NSError branchErrorWithCode:BNCSpotlightPublicIndexError`
`610`	`610`	`localizedMessage:@"Publically indexed cannot be removed from Spotlight"];`
`611`		`- completion(error);`
	`611`	`+ if (completion) completion(error);`
`612`	`612`	`}`
`613`	`613`	`}`
`614`	`614`