Title: [174720] trunk/Source/WebCore
Revision
174720
Author
[email protected]
Date
2014-10-14 18:21:29 -0700 (Tue, 14 Oct 2014)

Log Message

REGRESSION (r159208): Crash when clicking scrubber after navigating away/back to video
https://bugs.webkit.org/show_bug.cgi?id=137715

Reviewed by Darin Adler.

Simple null-check of m_player in refreshCachedTime.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::refreshCachedTime):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (174719 => 174720)


--- trunk/Source/WebCore/ChangeLog	2014-10-15 00:53:11 UTC (rev 174719)
+++ trunk/Source/WebCore/ChangeLog	2014-10-15 01:21:29 UTC (rev 174720)
@@ -1,3 +1,15 @@
+2014-10-14  Jer Noble  <[email protected]>
+
+        REGRESSION (r159208): Crash when clicking scrubber after navigating away/back to video
+        https://bugs.webkit.org/show_bug.cgi?id=137715
+
+        Reviewed by Darin Adler.
+
+        Simple null-check of m_player in refreshCachedTime.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::refreshCachedTime):
+
 2014-10-14  Chris Dumez  <[email protected]>
 
         [Mac] Fix inefficiencies in ResourceResponse::platformLazyInit(InitLevel)

Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (174719 => 174720)


--- trunk/Source/WebCore/html/HTMLMediaElement.cpp	2014-10-15 00:53:11 UTC (rev 174719)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp	2014-10-15 01:21:29 UTC (rev 174720)
@@ -2472,6 +2472,9 @@
 
 void HTMLMediaElement::refreshCachedTime() const
 {
+    if (!m_player)
+        return;
+
     m_cachedTime = m_player->currentTime();
     if (!m_cachedTime) {
         // Do not use m_cachedTime until the media engine returns a non-zero value because we can't 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to