Fixed crash with HCArgumentCaptor capturing blocks

The fix is to copy the captured argument.
hamcrest · Mar 22, 2018 · 4a40c4a · 4a40c4a
1 parent 7c18bca
commit 4a40c4a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,14 @@
 NEXT RELEASE
 ------------
 
+**Features:**
+
 - Made OCHamcrest/OCHamcrestIOS into modules, so you can @import them.
 
+**Fixes:**
+
+- Fixed crash with HCArgumentCaptor capturing blocks.
+
 
 Version 7.0.2
 -------------

diff --git a/Source/Library/Object/HCArgumentCaptor.m b/Source/Library/Object/HCArgumentCaptor.m
@@ -35,7 +35,7 @@ - (void)capture:(id)item
     if (self.captureEnabled)
     {
         id value = item ?: [NSNull null];
-        [self.values addObject:value];
+        [self.values addObject:[value copy]];
     }
 }
 

diff --git a/Source/Tests/Object/HCArgumentCaptorTests.m b/Source/Tests/Object/HCArgumentCaptorTests.m
@@ -29,7 +29,7 @@ - (void)tearDown
 - (void)testMatcher_ShouldAlwaysEvaluateToTrue
 {
     assertMatches(@"nil", sut, nil);
-    assertMatches(@"unknown object", sut, [[NSObject alloc] init]);
+    assertMatches(@"some object", sut, @123);
 }
 
 - (void)testMatcher_ShouldHaveReadableDescription
@@ -45,6 +45,15 @@ - (void)testValue_ShouldBeLastCapturedValue
     XCTAssertEqualObjects(sut.value, @"BAR");
 }
 
+- (void)testValue_ShouldBeCopyIfItCanBeCopied
+{
+    NSMutableString *original = [@"FOO" mutableCopy];
+
+    [sut matches:original];
+
+    XCTAssertFalse(sut.value == original);
+}
+
 - (void)testValue_WithNothingCaptured_ShouldReturnNil
 {
     XCTAssertNil(sut.value);