Fix a bug where invoking weaklyReferencedObject on a weak reference w…

…ould leak a reference count to the weakly referenced object.
gnachman · May 31, 2016 · ba2f88f · ba2f88f
1 parent f85effd
commit ba2f88f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/iTerm2XCTests/iTermWeakReferenceTest.m b/iTerm2XCTests/iTermWeakReferenceTest.m
@@ -74,6 +74,18 @@ - (void)testWeaklyReferencedObjectMethodAfterDealloc {
     XCTAssertEqual(weakReference.weaklyReferencedObject, nil);
 }
 
+- (void)testWeaklyReferencedObjectDoesNotLeak {
+    iTermWeaklyReferenceableObject *object = [[iTermWeaklyReferenceableObject alloc] init];
+    iTermWeaklyReferenceableObject<iTermWeakReference> *weakReference = [object weakSelf];
+
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    XCTAssertEqual(weakReference.weaklyReferencedObject, object);
+    [object release];
+    [pool drain];
+
+    XCTAssertEqual(weakReference.weaklyReferencedObject, nil);
+}
+
 - (void)testTwoWeakRefsToSameObject {
     iTermWeaklyReferenceableObject *object = [[iTermWeaklyReferenceableObject alloc] init];
     XCTAssert(object.retainCount == 1);

diff --git a/sources/iTermWeakReference.m b/sources/iTermWeakReference.m
@@ -62,7 +62,7 @@ - (id)weaklyReferencedObject {
     id theObject = [_object retain];
     OSSpinLockUnlock(&lock);
 
-    return [[theObject retain] autorelease];
+    return [theObject autorelease];
 }
 
 #pragma mark - Notifications