Reviewed by Mitz.
Fix memory leak from -[WebDocumentLoadState setTitle:].
* Loader/WebDocumentLoadState.m:
(-[WebDocumentLoadState setTitle:]): Ensure 'trimmed' is released even when length is
zero, and untangle the confusing logic around this case.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16878
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2006-10-07 Mark Rowe <bdash@webkit.org>
+
+ Reviewed by Mitz.
+
+ Fix memory leak from -[WebDocumentLoadState setTitle:].
+
+ * Loader/WebDocumentLoadState.m:
+ (-[WebDocumentLoadState setTitle:]): Ensure 'trimmed' is released even when length is
+ zero, and untangle the confusing logic around this case.
+
2006-10-06 Brady Eidson <beidson@apple.com>
Reviewed by Darin
- (void)setTitle:(NSString *)title
{
- NSString *trimmed;
- if (title == nil) {
- trimmed = nil;
- } else {
+ NSString *trimmed = nil;
+ if (title) {
trimmed = [title mutableCopy];
CFStringTrimWhitespace((CFMutableStringRef)trimmed);
- if ([trimmed length] == 0)
+ if ([trimmed length] == 0) {
+ [trimmed release];
trimmed = nil;
+ }
}
- if (trimmed == nil) {
- if (pageTitle == nil)
- return;
- } else {
- if ([pageTitle isEqualToString:trimmed])
- return;
- }
-
- if (!trimmed || [trimmed length] == 0)
+
+ if (!trimmed)
+ return;
+
+ if ([pageTitle isEqualToString:trimmed])
return;
[frameLoader willChangeTitleForDocumentLoadState:self];