Title: [157648] trunk/Source/WebKit2
- Revision
- 157648
- Author
- m...@apple.com
- Date
- 2013-10-18 14:09:11 -0700 (Fri, 18 Oct 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (157647 => 157648)
--- trunk/Source/WebKit2/ChangeLog 2013-10-18 20:53:06 UTC (rev 157647)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-18 21:09:11 UTC (rev 157648)
@@ -1,3 +1,13 @@
+2013-10-18 Dan Bernstein <m...@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 <ander...@apple.com>
Remove some Windows specific code from WebKit2
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm (157647 => 157648)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-10-18 20:53:06 UTC (rev 157647)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-10-18 21:09:11 UTC (rev 157648)
@@ -49,12 +49,12 @@
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;
}
@interface WKBrowsingContextControllerData : NSObject {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
