Title: [152854] branches/safari-537-branch/Source/WebKit2
Revision
152854
Author
[email protected]
Date
2013-07-18 11:33:07 -0700 (Thu, 18 Jul 2013)

Log Message

Merged r152805.  <rdar://problem/14173389>

Modified Paths

Diff

Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (152853 => 152854)


--- branches/safari-537-branch/Source/WebKit2/ChangeLog	2013-07-18 18:31:44 UTC (rev 152853)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog	2013-07-18 18:33:07 UTC (rev 152854)
@@ -1,3 +1,21 @@
+2013-07-18  Lucas Forschler  <[email protected]>
+
+        Merge r152805
+
+    2013-07-17  Alexey Proskuryakov  <[email protected]>
+
+            [Mac] Crashes in CFURLGetBytes under WebProcess::updateActivePages()
+            https://bugs.webkit.org/show_bug.cgi?id=118814
+            <rdar://problem/14173389>
+
+            Reviewed by Brady Eidson.
+
+            Speculative fix. It's unclear how we end up with an invalid URL when committing
+            a load.
+
+            * WebProcess/mac/WebProcessMac.mm: (WebKit::WebProcess::updateActivePages):
+            Added a null check.
+
 2013-07-17  Lucas Forschler  <[email protected]>
 
         Merge r152740

Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/mac/WebProcessMac.mm (152853 => 152854)


--- branches/safari-537-branch/Source/WebKit2/WebProcess/mac/WebProcessMac.mm	2013-07-18 18:31:44 UTC (rev 152853)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/mac/WebProcessMac.mm	2013-07-18 18:33:07 UTC (rev 152854)
@@ -238,7 +238,14 @@
             mainFrameOriginString = mainFrameOrigin->toRawString();
         else
             mainFrameOriginString = KURL(KURL(), mainFrame->url()).protocol() + ':'; // toRawString() is not supposed to work with unique origins, and would just return "://".
-        CFArrayAppendValue(activePageURLs.get(), userVisibleString([NSURL URLWithString:mainFrameOriginString]));
+
+        NSURL *originAsNSURL = [NSURL URLWithString:mainFrameOriginString];
+        // +[NSURL URLWithString:] returns nil when its argument is malformed. It's unclear how we can possibly have a malformed URL here,
+        // but it happens in practice according to <rdar://problem/14173389>. Leaving an assertion in to catch a reproducible case.
+        ASSERT(originAsNSURL);
+        NSString *userVisibleOriginString = originAsNSURL ? userVisibleString(originAsNSURL) : @"(null)";
+
+        CFArrayAppendValue(activePageURLs.get(), userVisibleOriginString);
     }
     WKSetApplicationInformationItem(kLSActivePageUserVisibleOriginsKey, activePageURLs.get());
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to