Merge pull request #281 from iangithubusername/PassByReferenceCrash

+[OCMArg setTo:] crashes if invoked with NULL
erikdoe · Jan 20, 2016 · 6689ba4 · 6689ba4
2 parents 7d5f199 + 867d7a5
commit 6689ba4
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/Source/OCMock/OCMPassByRefSetter.m b/Source/OCMock/OCMPassByRefSetter.m
@@ -37,10 +37,14 @@ - (void)dealloc
 
 - (void)handleArgument:(id)arg
 {
-    if([value isKindOfClass:[NSValue class]])
-        [(NSValue *)value getValue:[arg pointerValue]];
-    else
-        *(id *)[arg pointerValue] = value;
+    void *pointerValue = [arg pointerValue];
+    if(pointerValue != NULL)
+    {
+        if([value isKindOfClass:[NSValue class]])
+            [(NSValue *)value getValue:pointerValue];
+        else
+            *(id *)pointerValue = value;
+    }
 }
 
 @end
diff --git a/Source/OCMockTests/OCMockObjectTests.m b/Source/OCMockTests/OCMockObjectTests.m
@@ -106,6 +106,25 @@ - (void)doStuffWithBlock:(void (^)())block andString:(id)aString;
 @end
 
 
+@interface TestClassWithByReferenceMethod : NSObject
+
+- (void)returnValuesInObjectPointer:(id *)objectPointer booleanPointer:(BOOL *)booleanPointer;
+
+@end
+
+@implementation TestClassWithByReferenceMethod
+
+- (void)returnValuesInObjectPointer:(id *)objectPointer booleanPointer:(BOOL *)booleanPointer
+{
+    if(objectPointer != NULL)
+        *objectPointer = [[NSObject alloc] init];
+    if(booleanPointer != NULL)
+        *booleanPointer = NO;
+}
+
+@end
+
+
 @interface NotificationRecorderForTesting : NSObject
 {
 	@public
@@ -637,6 +656,15 @@ - (void)testReturnsValuesInNonObjectPassByReferenceArguments
 }
 
 
+- (void)testReturnsValuesInNullPassByReferenceArguments
+{
+    mock = OCMClassMock([TestClassWithByReferenceMethod class]);
+    OCMStub([mock returnValuesInObjectPointer:[OCMArg setTo:nil] booleanPointer:[OCMArg setToValue:@NO]]);
+    [mock returnValuesInObjectPointer:NULL booleanPointer:NULL];
+    OCMVerify([mock returnValuesInObjectPointer:NULL booleanPointer:NULL]);
+}
+
+
 // --------------------------------------------------------------------------------------
 //	invoking block arguments
 // --------------------------------------------------------------------------------------