Changeset 179937 in webkit

Timestamp:

Feb 11, 2015, 10:36:38 AM (12 years ago)

Author:

weinig@apple.com

Message:

performance.now can crash if accessed from a window that has navigated
<rdar://problem/16892506>
​https://bugs.webkit.org/show_bug.cgi?id=141478

Reviewed by Alexey Proskuryakov.

Test: fast/performance/performance-now-crash-on-navigated-window.html

• page/Performance.cpp:

(WebCore::Performance::now):
Check for a null frame, which can happen when the window has been navigated.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Performance.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-11  Sam Weinig  <sam@webkit.org>
+
+        performance.now can crash if accessed from a window that has navigated
+        <rdar://problem/16892506>
+        https://bugs.webkit.org/show_bug.cgi?id=141478
+
+        Reviewed by Alexey Proskuryakov.
+
+        Test: fast/performance/performance-now-crash-on-navigated-window.html
+
+        * page/Performance.cpp:
+        (WebCore::Performance::now):
+        Check for a null frame, which can happen when the window has been navigated.
+
 2015-02-10  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/page/Performance.cpp

@@ -229 +229 @@
 double Performance::now() const
 {
+    if (!frame())
+        return 0;
+
     return 1000.0 * m_frame->document()->loader()->timing().monotonicTimeToZeroBasedDocumentTime(monotonicallyIncreasingTime());
 }