Changeset 194589 in webkit

Timestamp:

Jan 5, 2016 9:58:45 AM (8 years ago)

Author:

eric.carlson@apple.com

Message:

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.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-05  Eric Carlson  <eric.carlson@apple.com>
+
+        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-05  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/page/Page.cpp

@@ -1213 +1213 @@
     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();
     }