Title: [181767] tags/Safari-601.1.23.3/Source/WebCore
- Revision
- 181767
- Author
- matthew_han...@apple.com
- Date
- 2015-03-19 16:33:17 -0700 (Thu, 19 Mar 2015)
Log Message
Merge r181662. rdar://problem/20144648
Modified Paths
Diff
Modified: tags/Safari-601.1.23.3/Source/WebCore/ChangeLog (181766 => 181767)
--- tags/Safari-601.1.23.3/Source/WebCore/ChangeLog 2015-03-19 23:26:08 UTC (rev 181766)
+++ tags/Safari-601.1.23.3/Source/WebCore/ChangeLog 2015-03-19 23:33:17 UTC (rev 181767)
@@ -1,3 +1,19 @@
+2015-03-19 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r181662. rdar://problem/20144648
+
+ 2015-03-17 Jer Noble <jer.no...@apple.com>
+
+ REGRESSION (r181423): Crash @ generatedcontent.org at com.apple.WebCore: WebCore::MediaPlayer::maximumDurationToCacheMediaTime const + 4
+ https://bugs.webkit.org/show_bug.cgi?id=142787
+
+ Reviewed by Eric Carlson.
+
+ Null check m_player before derefencing.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+
2015-03-19 Babak Shafiei <bshaf...@apple.com>
Merge r181668.
Modified: tags/Safari-601.1.23.3/Source/WebCore/html/HTMLMediaElement.cpp (181766 => 181767)
--- tags/Safari-601.1.23.3/Source/WebCore/html/HTMLMediaElement.cpp 2015-03-19 23:26:08 UTC (rev 181766)
+++ tags/Safari-601.1.23.3/Source/WebCore/html/HTMLMediaElement.cpp 2015-03-19 23:33:17 UTC (rev 181767)
@@ -2474,7 +2474,7 @@
void HTMLMediaElement::invalidateCachedTime() const
{
- if (!m_player->maximumDurationToCacheMediaTime())
+ if (!m_player || !m_player->maximumDurationToCacheMediaTime())
return;
#if !LOG_DISABLED
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
