Changeset 211613 in webkit

Timestamp:

Feb 2, 2017 5:01:32 PM (7 years ago)

Author:

Wenson Hsieh

Message:

CrashTracer: [USER] com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::URL::host const + 9
​https://bugs.webkit.org/show_bug.cgi?id=167766
<rdar://problem/30132707>

Reviewed by Chris Dumez.

The mainframe's document pointer may be null when tearing down a page upon navigation to a page that is in the
page cache. If this triggers a GC sweep, we will attempt to reload touch bar media controls, which (as a part of
the media controller heuristic) checks the mainframe's document URL to see if quirks should be enabled. This
assumes that the mainframe's document exists, which is not a safe assumption if page navigation is occurring. As
such, we need a null check for the mainframe's document in needsPlaybackControlsManagerQuirk().

No test, as we were unable to reproduce this crash.

• html/HTMLMediaElement.cpp:

(WebCore::needsPlaybackControlsManagerQuirk):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-02  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        CrashTracer: [USER] com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::URL::host const + 9
+        https://bugs.webkit.org/show_bug.cgi?id=167766
+        <rdar://problem/30132707>
+
+        Reviewed by Chris Dumez.
+
+        The mainframe's document pointer may be null when tearing down a page upon navigation to a page that is in the
+        page cache. If this triggers a GC sweep, we will attempt to reload touch bar media controls, which (as a part of
+        the media controller heuristic) checks the mainframe's document URL to see if quirks should be enabled. This
+        assumes that the mainframe's document exists, which is not a safe assumption if page navigation is occurring. As
+        such, we need a null check for the mainframe's document in needsPlaybackControlsManagerQuirk().
+
+        No test, as we were unable to reproduce this crash.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::needsPlaybackControlsManagerQuirk):
+
 2017-02-02  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -584 +584 @@
         return false;
 
-    String host = page.mainFrame().document()->url().host();
+    auto* document = page.mainFrame().document();
+    if (!document)
+        return false;
+
+    String host = document->url().host();
     return equalLettersIgnoringASCIICase(host, "netflix.com") || host.endsWithIgnoringASCIICase(".netflix.com");
 }