Title: [170367] trunk/Source/WebCore
- Revision
- 170367
- Author
- [email protected]
- Date
- 2014-06-24 10:05:09 -0700 (Tue, 24 Jun 2014)
Log Message
REGRESSION(r170336): Crash in HTMLMediaElement::seekTimerFired()
https://bugs.webkit.org/show_bug.cgi?id=134253
Rubber-stamped by Eric Carlson.
Now that seekWithTolerance() has been split up into an asyncronous section, the null-checks in seekWithTolerance()
need to be re-performed in seekTimerFired(), in case the m_player has been cleared between when the seek was initiated
and when the asynchronous section is performed.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::seekTimerFired):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (170366 => 170367)
--- trunk/Source/WebCore/ChangeLog 2014-06-24 16:47:33 UTC (rev 170366)
+++ trunk/Source/WebCore/ChangeLog 2014-06-24 17:05:09 UTC (rev 170367)
@@ -1,3 +1,17 @@
+2014-06-24 Jer Noble <[email protected]>
+
+ REGRESSION(r170336): Crash in HTMLMediaElement::seekTimerFired()
+ https://bugs.webkit.org/show_bug.cgi?id=134253
+
+ Rubber-stamped by Eric Carlson.
+
+ Now that seekWithTolerance() has been split up into an asyncronous section, the null-checks in seekWithTolerance()
+ need to be re-performed in seekTimerFired(), in case the m_player has been cleared between when the seek was initiated
+ and when the asynchronous section is performed.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::seekTimerFired):
+
2014-06-24 Eva Balazsfalvi <[email protected]>
Fix unused parameter warnings if inspector is disabled
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (170366 => 170367)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-06-24 16:47:33 UTC (rev 170366)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-06-24 17:05:09 UTC (rev 170367)
@@ -2379,6 +2379,11 @@
void HTMLMediaElement::seekTimerFired(Timer<HTMLMediaElement>&)
{
+ if (!m_player) {
+ m_seeking = false;
+ return;
+ }
+
ASSERT(m_pendingSeek);
double now = m_pendingSeek->now;
double time = m_pendingSeek->targetTime;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
