Changeset 185962 in webkit

Timestamp:

Jun 25, 2015, 2:00:25 PM (10 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] Crash in WebCore::MediaPlayer::canPlayToWirelessPlaybackTarget
​https://bugs.webkit.org/show_bug.cgi?id=146317

Reviewed by Brent Fulgham.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::mediaState): NULL-check m_player before using it.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-25  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] Crash in WebCore::MediaPlayer::canPlayToWirelessPlaybackTarget
+        https://bugs.webkit.org/show_bug.cgi?id=146317
+
+        Reviewed by Brent Fulgham.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::mediaState): NULL-check m_player before using it.
+
 2015-06-25  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -6318 +6318 @@
         state |= IsPlayingToExternalDevice;
 
-    if (!m_mediaSession->wirelessVideoPlaybackDisabled(*this) && m_hasPlaybackTargetAvailabilityListeners && m_player->canPlayToWirelessPlaybackTarget())
+    if (m_player && m_hasPlaybackTargetAvailabilityListeners && !m_mediaSession->wirelessVideoPlaybackDisabled(*this) && m_player->canPlayToWirelessPlaybackTarget())
         state |= RequiresPlaybackTargetMonitoring;