Changeset 165412 in webkit

Timestamp:

Mar 10, 2014 4:08:55 PM (10 years ago)

Author:

Simon Fraser

Message:

Fix three leaks
​https://bugs.webkit.org/show_bug.cgi?id=130048

Reviewed by Anders Carlsson.

Source/WebCore:

The NSDictionary was leaked.

• page/ios/UserAgentIOS.mm:

(WebCore::osMarketingVersion):

Source/WebKit2:

• Shared/API/Cocoa/WKRemoteObjectCoder.mm:

(decodeObject): Code is simpler and less leaky without the RetainPtr.

• UIProcess/API/Cocoa/WKNavigationAction.mm: Fix _originalURL leak

by making it a RetainPtr and implementing the getter and setter.
(-[WKNavigationAction _setOriginalURL:]):
(-[WKNavigationAction _originalURL]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/ios/UserAgentIOS.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm (modified) (2 diffs)
• WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix three leaks
+        https://bugs.webkit.org/show_bug.cgi?id=130048
+
+        Reviewed by Anders Carlsson.
+
+        The NSDictionary was leaked.
+
+        * page/ios/UserAgentIOS.mm:
+        (WebCore::osMarketingVersion):
+
 2014-03-10  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/page/ios/UserAgentIOS.mm

@@ -45 +45 @@
 static NSString *osMarketingVersion()
 {
-    RetainPtr<NSDictionary> systemInfo = [[NSDictionary alloc] initWithContentsOfFile:[platformSystemRootDirectory() stringByAppendingPathComponent:@"System/Library/CoreServices/SystemVersion.plist"]];
+    RetainPtr<NSDictionary> systemInfo = adoptNS([[NSDictionary alloc] initWithContentsOfFile:[platformSystemRootDirectory() stringByAppendingPathComponent:@"System/Library/CoreServices/SystemVersion.plist"]]);
     NSString *productVersion = [systemInfo objectForKey:@"ProductVersion"];
     return !productVersion ? @"" : [productVersion stringByReplacingOccurrencesOfString:@"." withString:@"_"];

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix three leaks
+        https://bugs.webkit.org/show_bug.cgi?id=130048
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+        (decodeObject): Code is simpler and less leaky without the RetainPtr.
+        * UIProcess/API/Cocoa/WKNavigationAction.mm: Fix _originalURL leak
+        by making it a RetainPtr and implementing the getter and setter.
+        (-[WKNavigationAction _setOriginalURL:]):
+        (-[WKNavigationAction _originalURL]):
+
 2014-03-10  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm

@@ -498 +498 @@
         return decodeInvocation(decoder);
 
-    RetainPtr<id> result = [objectClass allocWithZone:decoder.zone];
+    id result = [objectClass allocWithZone:decoder.zone];
     if (!result)
         [NSException raise:NSInvalidUnarchiveOperationException format:@"Class \"%s\" returned nil from +alloc while being decoded", className.data()];
@@ -510 +510 @@
         [NSException raise:NSInvalidUnarchiveOperationException format:@"Object of class \"%s\" returned nil from -awakeAfterUsingCoder: while being decoded", className.data()];
 
-    return [result.leakRef() autorelease];
+    return [result autorelease];
 }
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm

@@ -35 +35 @@
     RetainPtr<WKFrameInfo> _destinationFrame;
     RetainPtr<NSURLRequest> _request;
+    RetainPtr<NSURL> _originalURL;
 }
 
@@ -73 +74 @@
 }
 
+- (void)_setOriginalURL:(NSURL *)originalURL
+{
+    _originalURL = adoptNS([originalURL copy]);
+}
+
+- (NSURL *)_originalURL
+{
+    return _originalURL.get();
+}
+
 @end