Fix issues identified by Facebook Infer

erikdoe · Jun 20, 2015 · e50f4f9 · e50f4f9
1 parent da6dc18
commit e50f4f9
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 30 deletions.
diff --git a/Source/OCMock/OCMBlockCaller.m b/Source/OCMock/OCMBlockCaller.m
@@ -21,8 +21,11 @@ @implementation OCMBlockCaller
 
 -(id)initWithCallBlock:(void (^)(NSInvocation *))theBlock 
 {
-	self = [super init];
-	block = [theBlock copy];
+    if ((self = [super init]))
+    {
+        block = [theBlock copy];
+    }
+
 	return self;
 }
 

diff --git a/Source/OCMock/OCMConstraint.m b/Source/OCMock/OCMConstraint.m
@@ -134,8 +134,11 @@ @implementation OCMBlockConstraint
 
 - (instancetype)initWithConstraintBlock:(BOOL (^)(id))aBlock
 {
-	self = [super init];
-	block = [aBlock copy];
+    if ((self = [super init]))
+    {
+        block = [aBlock copy];
+    }
+
 	return self;
 }
 
@@ -146,7 +149,7 @@ - (void)dealloc {
 
 - (BOOL)evaluate:(id)value 
 {
-	return block(value);
+    return block ? block(value) : NO;
 }
 
 

diff --git a/Source/OCMock/OCMFunctions.m b/Source/OCMock/OCMFunctions.m
@@ -189,8 +189,8 @@ Class OCMGetIsa(id object)
 
 #pragma mark  Alias for renaming real methods
 
-NSString *OCMRealMethodAliasPrefix = @"ocmock_replaced_";
-const char *OCMRealMethodAliasPrefixCString = "ocmock_replaced_";
+static NSString *const OCMRealMethodAliasPrefix = @"ocmock_replaced_";
+static const char *const OCMRealMethodAliasPrefixCString = "ocmock_replaced_";
 
 BOOL OCMIsAliasSelector(SEL selector)
 {
@@ -217,7 +217,7 @@ SEL OCMOriginalSelectorForAlias(SEL selector)
 
 #pragma mark  Wrappers around associative references
 
-NSString *OCMClassMethodMockObjectKey = @"OCMClassMethodMockObjectKey";
+static NSString *const OCMClassMethodMockObjectKey = @"OCMClassMethodMockObjectKey";
 
 void OCMSetAssociatedMockForClass(OCClassMockObject *mock, Class aClass)
 {
@@ -238,7 +238,7 @@ void OCMSetAssociatedMockForClass(OCClassMockObject *mock, Class aClass)
     return mock;
 }
 
-NSString *OCMPartialMockObjectKey = @"OCMPartialMockObjectKey";
+static NSString *const OCMPartialMockObjectKey = @"OCMPartialMockObjectKey";
 
 void OCMSetAssociatedMockForObject(OCClassMockObject *mock, id anObject)
 {

diff --git a/Source/OCMock/OCMIndirectReturnValueProvider.m b/Source/OCMock/OCMIndirectReturnValueProvider.m
@@ -23,9 +23,12 @@ @implementation OCMIndirectReturnValueProvider
 
 - (id)initWithProvider:(id)aProvider andSelector:(SEL)aSelector
 {
-	self = [super init];
-	provider = [aProvider retain];
-	selector = aSelector;
+    if ((self = [super init]))
+    {
+        provider = [aProvider retain];
+        selector = aSelector;
+    }
+
 	return self;
 }
 

diff --git a/Source/OCMock/OCMLocation.m b/Source/OCMock/OCMLocation.m
@@ -25,10 +25,13 @@ + (instancetype)locationWithTestCase:(id)aTestCase file:(NSString *)aFile line:(
 
 - (instancetype)initWithTestCase:(id)aTestCase file:(NSString *)aFile line:(NSUInteger)aLine
 {
-    self = [super init];
-    testCase = aTestCase;
-    file = [aFile retain];
-    line = aLine;
+    if ((self = [super init]))
+    {
+        testCase = aTestCase;
+        file = [aFile retain];
+        line = aLine;
+    }
+
     return self;
 }
 

diff --git a/Source/OCMock/OCMMacroState.m b/Source/OCMock/OCMMacroState.m
@@ -24,7 +24,7 @@
 
 @implementation OCMMacroState
 
-OCMMacroState *globalState;
+static OCMMacroState *globalState;
 
 #pragma mark  Methods to begin/end macros
 
@@ -79,8 +79,11 @@ + (OCMMacroState *)globalState
 
 - (id)initWithRecorder:(OCMRecorder *)aRecorder
 {
-    self = [super init];
-    recorder = [aRecorder retain];
+    if ((self = [super init]))
+    {
+        recorder = [aRecorder retain];
+    }
+
     return self;
 }
 

diff --git a/Source/OCMock/OCMNotificationPoster.m b/Source/OCMock/OCMNotificationPoster.m
@@ -21,8 +21,11 @@ @implementation OCMNotificationPoster
 
 - (id)initWithNotification:(id)aNotification
 {
-	self = [super init];
-	notification = [aNotification retain];
+    if ((self = [super init]))
+    {
+        notification = [aNotification retain];
+    }
+
 	return self;
 }
 

diff --git a/Source/OCMock/OCMPassByRefSetter.m b/Source/OCMock/OCMPassByRefSetter.m
@@ -21,8 +21,11 @@ @implementation OCMPassByRefSetter
 
 - (id)initWithValue:(id)aValue
 {
-	self = [super init];
-	value = [aValue retain];
+    if ((self = [super init]))
+    {
+        value = [aValue retain];
+    }
+
 	return self;
 }
 

diff --git a/Source/OCMock/OCMReturnValueProvider.m b/Source/OCMock/OCMReturnValueProvider.m
@@ -23,8 +23,11 @@ @implementation OCMReturnValueProvider
 
 - (instancetype)initWithValue:(id)aValue
 {
-	self = [super init];
-	returnValue = [aValue retain];
+    if ((self = [super init]))
+    {
+        returnValue = [aValue retain];
+    }
+
 	return self;
 }
 

diff --git a/Source/OCMock/OCMVerifier.m b/Source/OCMock/OCMVerifier.m
@@ -25,8 +25,11 @@ @implementation OCMVerifier
 
 - (id)init
 {
-    self = [super init];
-    invocationMatcher = [[OCMInvocationMatcher alloc] init];
+    if ((self = [super init]))
+    {
+        invocationMatcher = [[OCMInvocationMatcher alloc] init];
+    }
+
     return self;
 }
 

diff --git a/Source/OCMock/OCObserverMockObject.m b/Source/OCMock/OCObserverMockObject.m
@@ -26,9 +26,12 @@ @implementation OCObserverMockObject
 
 - (id)init
 {
-	self = [super init];
-	recorders = [[NSMutableArray alloc] init];
-	centers = [[NSMutableArray alloc] init];
+    if ((self = [super init]))
+    {
+        recorders = [[NSMutableArray alloc] init];
+        centers = [[NSMutableArray alloc] init];
+    }
+
 	return self;
 }
 

diff --git a/Source/OCMockTests/OCMConstraintTests.m b/Source/OCMockTests/OCMConstraintTests.m
@@ -143,5 +143,11 @@ -(void)testBlockConstraintCanCaptureArgument
 	XCTAssertEqualObjects(@"bar", captured, @"Should have captured value from last invocation.");
 }
 
+- (void)testEvaluateNilBlockReturnsNo
+{
+    OCMBlockConstraint *constraint = [[OCMBlockConstraint alloc] initWithConstraintBlock:nil];
+
+    XCTAssertFalse([constraint evaluate:@"foo"]);
+}
 
 @end