Fix possible (ok, likely) retain cycle in documents created with -ini…

…tWithData:contentTypeHeader:.
ChatSecure · Dec 20, 2016 · 096dcc0 · 096dcc0
1 parent 2206f2f
commit 096dcc0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## [Unreleased][]
+
+* Fix retain cycle on documents created with `-[HTMLDocument initWithData:contentTypeHeader:]`.
+
 ## [2.0.1][]
 
 * Fix buffer overflow when parsing named entities.

diff --git a/Sources/HTMLParser.m b/Sources/HTMLParser.m
@@ -3303,15 +3303,15 @@ - (NSUInteger)hash
     NSString *initialString;
     HTMLStringEncoding initialEncoding = DeterminedStringEncodingForData(data, contentType, &initialString);
     HTMLParser *initialParser = [[HTMLParser alloc] initWithString:initialString encoding:initialEncoding context:nil];
-    __block HTMLParser *parser = initialParser;
+    __block HTMLParser *finalParser;
     initialParser.changeEncoding = ^(HTMLStringEncoding newEncoding) {
         NSString *correctedString = [[NSString alloc] initWithData:data encoding:newEncoding.encoding];
         if (correctedString) {
-            parser = [[HTMLParser alloc] initWithString:correctedString encoding:newEncoding context:nil];
+            finalParser = [[HTMLParser alloc] initWithString:correctedString encoding:newEncoding context:nil];
         } else {
-            parser = [[HTMLParser alloc] initWithString:initialString encoding:initialEncoding context:nil];
+            finalParser = [[HTMLParser alloc] initWithString:initialString encoding:initialEncoding context:nil];
         }
     };
     [initialParser document];
-    return parser;
+    return finalParser ?: initialParser;
 }