Changeset 152805 in webkit

Timestamp:

Jul 17, 2013, 3:05:45 PM (12 years ago)

Author:

ap@apple.com

Message:

[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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/mac/WebProcessMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-07-17  Alexey Proskuryakov  <ap@apple.com>
+
+        [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  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm

@@ -239 +239 @@
         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());