Title: [195206] releases/WebKitGTK/webkit-2.10/Source/WebCore
- Revision
- 195206
- Author
- [email protected]
- Date
- 2016-01-18 04:16:16 -0800 (Mon, 18 Jan 2016)
Log Message
Merge r194589 - Avoid NULL deference in Page::updateIsPlayingMedia
https://bugs.webkit.org/show_bug.cgi?id=152732
No new tests, this fixes a rare crash that I am unable to reproduce.
Reviewed by David Kilzer.
* page/Page.cpp:
(WebCore::Page::updateIsPlayingMedia): frame->document() can return NULL.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195205 => 195206)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-18 12:14:57 UTC (rev 195205)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-18 12:16:16 UTC (rev 195206)
@@ -1,3 +1,15 @@
+2016-01-05 Eric Carlson <[email protected]>
+
+ Avoid NULL deference in Page::updateIsPlayingMedia
+ https://bugs.webkit.org/show_bug.cgi?id=152732
+
+ No new tests, this fixes a rare crash that I am unable to reproduce.
+
+ Reviewed by David Kilzer.
+
+ * page/Page.cpp:
+ (WebCore::Page::updateIsPlayingMedia): frame->document() can return NULL.
+
2016-01-04 Zan Dobersek <[email protected]>
Shave off a TransformationMatrix copy if RenderLayer's transparencyClipBox()
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Page.cpp (195205 => 195206)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Page.cpp 2016-01-18 12:14:57 UTC (rev 195205)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/page/Page.cpp 2016-01-18 12:16:16 UTC (rev 195206)
@@ -1186,7 +1186,8 @@
{
MediaProducer::MediaStateFlags state = MediaProducer::IsNotPlaying;
for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
- state |= frame->document()->mediaState();
+ if (Document* document = frame->document())
+ state |= document->mediaState();
}
if (state == m_mediaState)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
