Fix stream leak in SDPDYStreamManager.

twitter-archive · May 28, 2015 · 5f9354a · 5f9354a
1 parent 56d571f
commit 5f9354a
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/SPDY/SPDYStreamManager.m b/SPDY/SPDYStreamManager.m
@@ -22,7 +22,7 @@ @implementation SPDYStreamNode
 {
   @public
     __strong SPDYStreamNode *next;
-    __strong SPDYStreamNode *prev;
+    __weak SPDYStreamNode *prev;
     __strong SPDYStream *stream;
     __unsafe_unretained SPDYProtocol *protocol;
     SPDYStreamId streamId;

diff --git a/SPDYUnitTests/SPDYStreamManagerTest.m b/SPDYUnitTests/SPDYStreamManagerTest.m
@@ -150,4 +150,42 @@ - (void)testStreamRemoval
     STAssertEquals(streamCount, _numStreams - 2, nil);
 }
 
+- (void)testStreamRemovalDoesNotLeak
+{
+    SPDYStream __weak *weakone;
+    @autoreleasepool {
+        weakone = _manager[4];
+        STAssertNotNil(weakone, nil);
+        [_manager removeStreamWithStreamId:4];
+        STAssertNil(_manager[4], nil);
+    }
+    STAssertNil(weakone, nil);
+}
+
+- (void)testAllStreamRemovalDoesNotLeak
+{
+    SPDYStream __weak *weakone;
+    @autoreleasepool {
+        weakone = _manager[4];
+        STAssertNotNil(weakone, nil);
+        [_manager removeAllStreams];
+        STAssertNil(_manager[4], nil);
+    }
+    STAssertNil(weakone, nil);
+}
+
+- (void)testDeallocDoesNotLeak
+{
+    SPDYStreamManager __weak *weakmanager;
+    SPDYStream __weak *weakone;
+    @autoreleasepool {
+        weakmanager = _manager;
+        weakone = _manager[4];
+        STAssertNotNil(weakone, nil);
+        _manager = nil;
+    }
+    STAssertNil(weakmanager, nil);
+    STAssertNil(weakone, nil);
+}
+
 @end