Base error checking on return parameters as unsafe to check error / *error

flovilmart · flovilmart · commit eb3d3b07896f · 2018-01-19T19:32:25.000-05:00
diff --git a/Parse/Parse/Internal/Commands/PFRESTCommand.m b/Parse/Parse/Internal/Commands/PFRESTCommand.m
@@ -124,7 +124,7 @@ - (NSDictionary *)dictionaryRepresentation:(NSError **)error {
     }
     if (self.parameters) {
         NSDictionary *parameters = [[PFPointerOrLocalIdObjectEncoder objectEncoder] encodeObject:self.parameters error:error];
-        if (!parameters && error) {
+        if (!parameters) {
             return nil;
         }
         dictionary[PFRESTCommandParametersEncodingKey] = parameters;
@@ -225,7 +225,7 @@ - (BOOL)forEachLocalId:(BOOL(^)(PFObject *pointer))block error:(NSError **)error
 
     if ([[self class] forEachLocalIdIn:data doBlock:block]) {
         self.parameters = [[PFPointerOrLocalIdObjectEncoder objectEncoder] encodeObject:data error:error];
-        if (!self.parameters && error) {
+        if (!self.parameters) {
             return NO;
         }
     }
diff --git a/Parse/Parse/Internal/Commands/PFRESTPushCommand.m b/Parse/Parse/Internal/Commands/PFRESTPushCommand.m
@@ -26,7 +26,7 @@ + (instancetype)sendPushCommandWithPushState:(PFPushState *)state
 
     if (state.queryState) {
         NSDictionary *queryParameters = [PFRESTQueryCommand findCommandParametersForQueryState:state.queryState error:error];
-        if (!queryParameters && error) {
+        if (!queryParameters) {
             return nil;
         }
         parameters[@"where"] = queryParameters[@"where"];
diff --git a/Parse/Parse/Internal/Config/Controller/PFCurrentConfigController.m b/Parse/Parse/Internal/Config/Controller/PFCurrentConfigController.m
@@ -74,7 +74,7 @@ - (BFTask *)setCurrentConfigAsync:(PFConfig *)config {
         NSDictionary *configParameters = @{ PFConfigParametersRESTKey : (config.parametersDictionary ?: @{}) };
         NSError *error;
         id encodedObject = [[PFPointerObjectEncoder objectEncoder] encodeObject:configParameters error:&error];
-        if (!encodedObject && error) {
+        if (!encodedObject) {
             return [BFTask taskWithError:error];
         }
         NSData *jsonData = [PFJSONSerialization dataFromJSONObject:encodedObject];
diff --git a/Parse/Parse/Internal/FieldOperation/PFFieldOperation.m b/Parse/Parse/Internal/FieldOperation/PFFieldOperation.m
@@ -193,7 +193,7 @@ - (NSString *)description {
 
 - (id)encodeWithObjectEncoder:(PFEncoder *)objectEncoder error:(NSError **)error {
     NSMutableArray *encodedObjects = [objectEncoder encodeObject:self.objects error: error];
-    if (!encodedObjects && error) {
+    if (!encodedObjects) {
         return nil;
     }
     return @{ @"__op" : @"Add",
@@ -256,7 +256,7 @@ - (NSString *)description {
 
 - (id)encodeWithObjectEncoder:(PFEncoder *)objectEncoder error:(NSError **)error {
     NSMutableArray *encodedObjects = [objectEncoder encodeObject:self.objects error:error];
-    if (!encodedObjects && error) {
+    if (!encodedObjects) {
         return nil;
     }
     return @{ @"__op" : @"AddUnique",
@@ -334,7 +334,7 @@ - (NSString *)description {
 
 - (id)encodeWithObjectEncoder:(PFEncoder *)objectEncoder error:(NSError **)error {
     NSMutableArray *encodedObjects = [objectEncoder encodeObject:self.objects error:error];
-    if (!encodedObjects && error) {
+    if (!encodedObjects) {
         return nil;
     }
     return @{ @"__op" : @"Remove",
@@ -463,15 +463,15 @@ - (id)encodeWithObjectEncoder:(PFEncoder *)objectEncoder error:(NSError **)error
     NSDictionary *removeDict = nil;
     if (self.relationsToAdd.count > 0) {
         NSArray *array = [self _convertToArrayInSet:self.relationsToAdd withObjectEncoder:objectEncoder error:error];
-        if (!array && error) {
+        if (!array) {
             return nil;
         }
         addDict = @{ @"__op" : @"AddRelation",
                      @"objects" : array };
     }
     if (self.relationsToRemove.count > 0) {
         NSArray *array = [self _convertToArrayInSet:self.relationsToRemove withObjectEncoder:objectEncoder error:error];
-        if (!array && error) {
+        if (!array) {
             return nil;
         }
         removeDict = @{ @"__op" : @"RemoveRelation",
diff --git a/Parse/Parse/Internal/LocalDataStore/OfflineStore/PFOfflineStore.m b/Parse/Parse/Internal/LocalDataStore/OfflineStore/PFOfflineStore.m
@@ -265,7 +265,7 @@ - (instancetype)initWithFileManager:(PFFileManager *)fileManager options:(PFOffl
         return [[BFTask taskForCompletionOfAllTasks:objectValues] continueWithSuccessBlock:^id(BFTask *task) {
             PFDecoder *decoder = [PFOfflineDecoder decoderWithOfflineObjects:offlineObjects];
             NSError *error;
-            if (![object mergeFromRESTDictionary:parsedJson withDecoder:decoder error:&error] && error) {
+            if (![object mergeFromRESTDictionary:parsedJson withDecoder:decoder error:&error]) {
                 return [BFTask taskWithError:error];
             }
             return nil;
diff --git a/Parse/Parse/Internal/Object/BatchController/PFObjectBatchController.m b/Parse/Parse/Internal/Object/BatchController/PFObjectBatchController.m
@@ -123,7 +123,7 @@ - (BFTask *)deleteObjectsAsync:(NSArray *)objects withSessionToken:(NSString *)s
         for (NSArray *batch in objectBatches) {
             NSError *error;
             PFRESTCommand *command = [self _deleteCommandForObjects:batch withSessionToken:sessionToken serverURL:serverURL error:&error];
-            if (!command && error) {
+            if (!command) {
                 [tasks addObject:[BFTask taskWithError:error]];
                 continue;
             }
diff --git a/Parse/Parse/Internal/Object/LocalIdStore/PFObjectLocalIdStore.m b/Parse/Parse/Internal/Object/LocalIdStore/PFObjectLocalIdStore.m
@@ -210,7 +210,7 @@ - (NSString *)createLocalId {
 - (BOOL)retainLocalIdOnDisk:(NSString *)localId error:(NSError **)error {
     @synchronized (_lock) {
         PFObjectLocalIdStoreMapEntry *entry = [self getMapEntry:localId error:error];
-        if (!entry && error) {
+        if (!entry) {
             return NO;
         }
         entry.referenceCount++;
@@ -225,7 +225,7 @@ - (BOOL)retainLocalIdOnDisk:(NSString *)localId error:(NSError **)error {
 - (BOOL)releaseLocalIdOnDisk:(NSString *)localId error:(NSError **)error {
     @synchronized (_lock) {
         PFObjectLocalIdStoreMapEntry *entry = [self getMapEntry:localId error:error];
-        if (!entry && error) {
+        if (!entry) {
             return NO;
         }
         if (--entry.referenceCount > 0) {
@@ -242,7 +242,7 @@ - (BOOL)releaseLocalIdOnDisk:(NSString *)localId error:(NSError **)error {
 - (BOOL)setObjectId:(NSString *)objectId forLocalId:(NSString *)localId error:(NSError **)error {
     @synchronized (_lock) {
         PFObjectLocalIdStoreMapEntry *entry = [self getMapEntry:localId error:error];
-        if (!entry && error) {
+        if (!entry) {
             return NO;
         }
         if (entry.referenceCount > 0) {
diff --git a/Parse/Parse/Internal/PFAssert.h b/Parse/Parse/Internal/PFAssert.h
@@ -62,7 +62,7 @@ do { \
 Sets a recoverable error for propagation
  */
 #define PFConsistencyError(error, condition, rval, description, ...) \
-if (!(condition)) { \
+if (!(condition) && error) { \
 *error = [PFErrorUtilities errorWithCode:-1 message:[NSString stringWithFormat:description, ##__VA_ARGS__]];\
 return rval;\
 }
diff --git a/Parse/Parse/PFEncoder.m b/Parse/Parse/PFEncoder.m
@@ -99,7 +99,7 @@ - (id)encodeObject:(id)object error:(NSError **) error {
         __block NSError *encodingError = nil;
         [object enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
             dict[key] = [self encodeObject:obj error:&encodingError];
-            if (!dict[key] && encodingError) {
+            if (!dict[key]) {
                 hasErrored = YES;
                 *stop = YES;
             }
diff --git a/Parse/Parse/PFObject.m b/Parse/Parse/PFObject.m
@@ -462,7 +462,7 @@ + (BFTask *)_deepSaveAsyncChildrenOfObject:(id)object withCurrentUser:(PFUser *)
                             @synchronized ([object lock]) {
                                 [object _objectWillSave];
                                 NSError *error;
-                                if (![object _checkSaveParametersWithCurrentUser:currentUser error:&error] && error) {
+                                if (![object _checkSaveParametersWithCurrentUser:currentUser error:&error]) {
                                     return error;
                                 }
                                 command = [object _constructSaveCommandForChanges:[object unsavedChanges]
@@ -1107,14 +1107,14 @@ - (BFTask *)_enqueueSaveEventuallyWithChildren:(BOOL)saveChildren {
                     changes.saveEventually = YES;
                     [self startSave];
                     NSError *error;
-                    if (![self _checkSaveParametersWithCurrentUser:currentUser error:&error] && error) {
+                    if (![self _checkSaveParametersWithCurrentUser:currentUser error:&error]) {
                         saveTask = [BFTask taskWithError:error];
                     } else  {
                         PFRESTCommand *command = [self _constructSaveCommandForChanges:changes
                                                                           sessionToken:sessionToken
                                                                          objectEncoder:[PFPointerOrLocalIdObjectEncoder objectEncoder]
                                                                                  error:&error];
-                        if (!command && error) {
+                        if (!command) {
                             saveTask = [BFTask taskWithError:error];
                         } else {
                             // Enqueue the eventually operation!
@@ -1429,7 +1429,7 @@ - (BFTask *)saveAsync:(BFTask *)toAwait {
                 }
                 return [[childrenTask continueWithSuccessBlock:^id(BFTask *task) {
                     NSError *error;
-                    if (![self _checkSaveParametersWithCurrentUser:currentUser error:&error] && error) {
+                    if (![self _checkSaveParametersWithCurrentUser:currentUser error:&error]) {
                         return error;
                     }
                     PFRESTCommand *command = [self _constructSaveCommandForChanges:changes
diff --git a/Parse/Parse/PFRelation.m b/Parse/Parse/PFRelation.m
@@ -197,7 +197,7 @@ - (nullable NSDictionary *)encodeIntoDictionary:(NSError **)error {
     NSMutableArray *encodedObjects = [NSMutableArray arrayWithCapacity:state.knownObjects.count];
     for (PFObject *knownObject in state.knownObjects) {
         id result = [[PFPointerObjectEncoder objectEncoder] encodeObject:knownObject error:error];
-        if (!result && error) {
+        if (!result) {
             return nil;
         }
         [encodedObjects addObject:result];
diff --git a/Parse/Tests/Unit/FieldOperationTests.m b/Parse/Tests/Unit/FieldOperationTests.m
@@ -203,7 +203,9 @@ - (void)testAddOperationEncoding {
     OCMStub([encoder encodeObject:[OCMArg isEqual:@[ @"yarr" ]] error:nil]).andReturn(@"yolo");
 
     PFAddOperation *operation = [PFAddOperation addWithObjects:@[ @"yarr" ]];
-    XCTAssertThrows([operation encodeWithObjectEncoder:nil error:nil]);
+    NSError *error;
+    XCTAssertNil([operation encodeWithObjectEncoder:nil error:&error]);
+    XCTAssertNil(error);
     XCTAssertEqualObjects([operation encodeWithObjectEncoder:encoder error:nil], (@{ @"__op" : @"Add",
                                                                            @"objects" : @"yolo" }));
 }
@@ -252,7 +254,9 @@ - (void)testAddUniqueOperationEncoding {
     OCMStub([encoder encodeObject:[OCMArg isEqual:@[ @"yarr" ]] error:nil]).andReturn(@"yolo");
 
     PFAddUniqueOperation *operation = [PFAddUniqueOperation addUniqueWithObjects:@[ @"yarr" ]];
-    XCTAssertThrows([operation encodeWithObjectEncoder:nil error:nil]);
+    NSError *error;
+    XCTAssertNil([operation encodeWithObjectEncoder:nil error:&error]);
+    XCTAssertNil(error);
     XCTAssertEqualObjects([operation encodeWithObjectEncoder:encoder error:nil], (@{ @"__op" : @"AddUnique",
                                                                            @"objects" : @"yolo" }));
 }
@@ -301,7 +305,9 @@ - (void)testRemoveOperationEncoding {
     OCMStub([encoder encodeObject:[OCMArg isEqual:@[ @"yarr" ]] error:nil]).andReturn(@"yolo");
 
     PFRemoveOperation *operation = [PFRemoveOperation removeWithObjects:@[ @"yarr" ]];
-    XCTAssertThrows([operation encodeWithObjectEncoder:nil error:nil]);
+    NSError *error;
+    XCTAssertNil([operation encodeWithObjectEncoder:nil error:&error]);
+    XCTAssertNil(error);
     XCTAssertEqualObjects([operation encodeWithObjectEncoder:encoder error:nil], (@{ @"__op" : @"Remove",
                                                                            @"objects" : @"yolo" }));
 }

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ - (NSDictionary )dictionaryRepresentation:(NSError *)error {`
`124`	`124`	`}`
`125`	`125`	`if (self.parameters) {`
`126`	`126`	`NSDictionary *parameters = [[PFPointerOrLocalIdObjectEncoder objectEncoder] encodeObject:self.parameters error:error];`
`127`		`- if (!parameters && error) {`
	`127`	`+ if (!parameters) {`
`128`	`128`	`return nil;`
`129`	`129`	`}`
`130`	`130`	`dictionary[PFRESTCommandParametersEncodingKey] = parameters;`
`@@ -225,7 +225,7 @@ - (BOOL)forEachLocalId:(BOOL(^)(PFObject pointer))block error:(NSError *)error`
`225`	`225`
`226`	`226`	`if ([[self class] forEachLocalIdIn:data doBlock:block]) {`
`227`	`227`	`self.parameters = [[PFPointerOrLocalIdObjectEncoder objectEncoder] encodeObject:data error:error];`
`228`		`- if (!self.parameters && error) {`
	`228`	`+ if (!self.parameters) {`
`229`	`229`	`return NO;`
`230`	`230`	`}`
`231`	`231`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ + (instancetype)sendPushCommandWithPushState:(PFPushState *)state`
`26`	`26`
`27`	`27`	`if (state.queryState) {`
`28`	`28`	`NSDictionary *queryParameters = [PFRESTQueryCommand findCommandParametersForQueryState:state.queryState error:error];`
`29`		`- if (!queryParameters && error) {`
	`29`	`+ if (!queryParameters) {`
`30`	`30`	`return nil;`
`31`	`31`	`}`
`32`	`32`	`parameters[@"where"] = queryParameters[@"where"];`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ - (BFTask )setCurrentConfigAsync:(PFConfig )config {`
`74`	`74`	`NSDictionary *configParameters = @{ PFConfigParametersRESTKey : (config.parametersDictionary ?: @{}) };`
`75`	`75`	`NSError *error;`
`76`	`76`	`id encodedObject = [[PFPointerObjectEncoder objectEncoder] encodeObject:configParameters error:&error];`
`77`		`- if (!encodedObject && error) {`
	`77`	`+ if (!encodedObject) {`
`78`	`78`	`return [BFTask taskWithError:error];`
`79`	`79`	`}`
`80`	`80`	`NSData *jsonData = [PFJSONSerialization dataFromJSONObject:encodedObject];`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ - (instancetype)initWithFileManager:(PFFileManager *)fileManager options:(PFOffl`
`265`	`265`	`return [[BFTask taskForCompletionOfAllTasks:objectValues] continueWithSuccessBlock:^id(BFTask *task) {`
`266`	`266`	`PFDecoder *decoder = [PFOfflineDecoder decoderWithOfflineObjects:offlineObjects];`
`267`	`267`	`NSError *error;`
`268`		`- if (![object mergeFromRESTDictionary:parsedJson withDecoder:decoder error:&error] && error) {`
	`268`	`+ if (![object mergeFromRESTDictionary:parsedJson withDecoder:decoder error:&error]) {`
`269`	`269`	`return [BFTask taskWithError:error];`
`270`	`270`	`}`
`271`	`271`	`return nil;`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ - (BFTask )deleteObjectsAsync:(NSArray )objects withSessionToken:(NSString *)s`
`123`	`123`	`for (NSArray *batch in objectBatches) {`
`124`	`124`	`NSError *error;`
`125`	`125`	`PFRESTCommand *command = [self _deleteCommandForObjects:batch withSessionToken:sessionToken serverURL:serverURL error:&error];`
`126`		`- if (!command && error) {`
	`126`	`+ if (!command) {`
`127`	`127`	`[tasks addObject:[BFTask taskWithError:error]];`
`128`	`128`	`continue;`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ do { \`
`62`	`62`	`Sets a recoverable error for propagation`
`63`	`63`	`*/`
`64`	`64`	`#define PFConsistencyError(error, condition, rval, description, ...) \`
`65`		`-if (!(condition)) { \`
	`65`	`+if (!(condition) && error) { \`
`66`	`66`	`*error = [PFErrorUtilities errorWithCode:-1 message:[NSString stringWithFormat:description, ##__VA_ARGS__]];\`
`67`	`67`	`return rval;\`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ - (id)encodeObject:(id)object error:(NSError **) error {`
`99`	`99`	`__block NSError *encodingError = nil;`
`100`	`100`	`[object enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {`
`101`	`101`	`dict[key] = [self encodeObject:obj error:&encodingError];`
`102`		`- if (!dict[key] && encodingError) {`
	`102`	`+ if (!dict[key]) {`
`103`	`103`	`hasErrored = YES;`
`104`	`104`	`*stop = YES;`
`105`	`105`	`}`