Log Message
CRASH at WebCore::WebPlaybackSessionModelMediaElement::selectAudioMediaOption() + 104 https://bugs.webkit.org/show_bug.cgi?id=158090 <rdar://problem/26388936>
Reviewed by Eric Carlson. Null-check m_mediaElement before using. * platform/cocoa/WebPlaybackSessionModelMediaElement.mm: (WebPlaybackSessionModelMediaElement::selectAudioMediaOption): (WebPlaybackSessionModelMediaElement::selectLegibleMediaOption):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201402 => 201403)
--- trunk/Source/WebCore/ChangeLog 2016-05-25 21:19:09 UTC (rev 201402)
+++ trunk/Source/WebCore/ChangeLog 2016-05-25 21:57:03 UTC (rev 201403)
@@ -1,3 +1,17 @@
+2016-05-25 Jer Noble <jer.no...@apple.com>
+
+ CRASH at WebCore::WebPlaybackSessionModelMediaElement::selectAudioMediaOption() + 104
+ https://bugs.webkit.org/show_bug.cgi?id=158090
+ <rdar://problem/26388936>
+
+ Reviewed by Eric Carlson.
+
+ Null-check m_mediaElement before using.
+
+ * platform/cocoa/WebPlaybackSessionModelMediaElement.mm:
+ (WebPlaybackSessionModelMediaElement::selectAudioMediaOption):
+ (WebPlaybackSessionModelMediaElement::selectLegibleMediaOption):
+
2016-05-25 Brady Eidson <beid...@apple.com>
Race condition calling back to an IDBOpenDBRequest during WorkerThread shutdown.
Modified: trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm (201402 => 201403)
--- trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm 2016-05-25 21:19:09 UTC (rev 201402)
+++ trunk/Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm 2016-05-25 21:57:03 UTC (rev 201403)
@@ -229,6 +229,9 @@
void WebPlaybackSessionModelMediaElement::selectAudioMediaOption(uint64_t selectedAudioIndex)
{
+ if (!m_mediaElement)
+ return;
+
ASSERT(selectedAudioIndex < std::numeric_limits<size_t>::max());
AudioTrack* selectedAudioTrack = nullptr;
@@ -244,6 +247,9 @@
void WebPlaybackSessionModelMediaElement::selectLegibleMediaOption(uint64_t index)
{
+ if (!m_mediaElement)
+ return;
+
ASSERT(index < std::numeric_limits<size_t>::max());
TextTrack* textTrack = nullptr;
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
