Changeset 157648 in webkit

Timestamp:

Oct 18, 2013 2:09:11 PM (11 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] WKBrowsingController accessors crash instead of returning nil
​https://bugs.webkit.org/show_bug.cgi?id=123036

Reviewed by Anders Carlsson.

• UIProcess/API/mac/WKBrowsingContextController.mm:

(autoreleased): Return nil if the object is NULL.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKBrowsingContextController.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-10-18  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] WKBrowsingController accessors crash instead of returning nil
+        https://bugs.webkit.org/show_bug.cgi?id=123036
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/mac/WKBrowsingContextController.mm:
+        (autoreleased): Return nil if the object is NULL.
+
 2013-10-18  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm

@@ -50 +50 @@
 static inline NSString *autoreleased(WKStringRef string)
 {
-    return CFBridgingRelease(WKStringCopyCFString(kCFAllocatorDefault, adoptWK(string).get()));
+    return string ? CFBridgingRelease(WKStringCopyCFString(kCFAllocatorDefault, adoptWK(string).get())) : nil;
 }
 
 static inline NSURL *autoreleased(WKURLRef url)
 {
-    return CFBridgingRelease(WKURLCopyCFURL(kCFAllocatorDefault, adoptWK(url).get()));
+    return url ? CFBridgingRelease(WKURLCopyCFURL(kCFAllocatorDefault, adoptWK(url).get())) : nil;
 }