[WK2] MiniBrowser crashes on window.open()

        https://bugs.webkit.org/show_bug.cgi?id=93413

        Reviewed by Dan Bernstein.

        * MiniBrowser/mac/BrowserWindowController.m: (createNewPage): This is a "create"
        API, so it needs to return a retained result.

        * MiniBrowser/mac/WebBundle/WebBundleMain.m: (didClearWindowObjectForFrame):
        When this function is called, URL appears to be poorly defined. Sometimes, it's
        the new URL, other times it's the old one. An "old" URL is null in a new page.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125040 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 4bf0a65..225e512 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2012-08-08  Alexey Proskuryakov  <ap@apple.com>
+
+        [WK2] MiniBrowser crashes on window.open()
+        https://bugs.webkit.org/show_bug.cgi?id=93413
+
+        Reviewed by Dan Bernstein.
+
+        * MiniBrowser/mac/BrowserWindowController.m: (createNewPage): This is a "create"
+        API, so it needs to return a retained result.
+
+        * MiniBrowser/mac/WebBundle/WebBundleMain.m: (didClearWindowObjectForFrame):
+        When this function is called, URL appears to be poorly defined. Sometimes, it's
+        the new URL, other times it's the old one. An "old" URL is null in a new page.
+
 2012-08-08  Loïc Yhuel  <loic.yhuel@softathome.com>
 
         [Qt] Compile errors with OpenGLES2

diff --git a/Tools/MiniBrowser/mac/BrowserWindowController.m b/Tools/MiniBrowser/mac/BrowserWindowController.m
index 72d37be..eb0744c 100644 (file)
--- a/Tools/MiniBrowser/mac/BrowserWindowController.m
+++ b/Tools/MiniBrowser/mac/BrowserWindowController.m
@@ -412,7 +412,7 @@ static WKPageRef createNewPage(WKPageRef page, WKURLRequestRef request, WKDictio
     BrowserWindowController *controller = [[BrowserWindowController alloc] initWithContext:WKPageGetContext(page) pageGroup:WKPageGetPageGroup(page)];
     [controller loadWindow];
 
-    return controller->_webView.pageRef;
+    return WKRetain(controller->_webView.pageRef);
 }
 
 static void showPage(WKPageRef page, const void *clientInfo)

diff --git a/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m b/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m
index 2da3e95..509038a 100644 (file)
--- a/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m
+++ b/Tools/MiniBrowser/mac/WebBundle/WebBundleMain.m
@@ -44,7 +44,8 @@ void didClearWindowObjectForFrame(WKBundlePageRef page, WKBundleFrameRef frame,
     WKRelease(wkURL);
 
     LOG(@"WKBundlePageClient - didClearWindowForFrame %@", [(NSURL *)cfURL absoluteString]);
-    CFRelease(cfURL);
+    if (cfURL)
+        CFRelease(cfURL);
 
     WKStringRef messageName = WKStringCreateWithCFString(CFSTR("Callback"));
     WKStringRef messageBody = WKStringCreateWithCFString(CFSTR("Window was cleared"));