Title: [206623] branches/safari-602.2.14.0-branch/Source/WebCore
- Revision
- 206623
- Author
- [email protected]
- Date
- 2016-09-29 16:18:42 -0700 (Thu, 29 Sep 2016)
Log Message
Merge r206556. rdar://problem/28524440
Modified Paths
Diff
Modified: branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog (206622 => 206623)
--- branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog 2016-09-29 23:15:42 UTC (rev 206622)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog 2016-09-29 23:18:42 UTC (rev 206623)
@@ -1,3 +1,20 @@
+2016-09-29 Babak Shafiei <[email protected]>
+
+ Merge r206556. rdar://problem/28524440
+
+ 2016-09-28 Jer Noble <[email protected]>
+
+ CRASH at WebCore::CDMSessionAVStreamSession::update + 950
+ https://bugs.webkit.org/show_bug.cgi?id=162701
+
+ Reviewed by Beth Dakin.
+
+ If the SourceBuffer backing a <video> element is removed before CDMSessionAVStreamSession::update() gets
+ a chance to run, the protectedSourceBuffer will be null. Just bail early and indicate an error.
+
+ * platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm:
+ (WebCore::CDMSessionAVStreamSession::update):
+
2016-09-28 Babak Shafiei <[email protected]>
Merge r206551. rdar://problem/28526639
Modified: branches/safari-602.2.14.0-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm (206622 => 206623)
--- branches/safari-602.2.14.0-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm 2016-09-29 23:15:42 UTC (rev 206622)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm 2016-09-29 23:18:42 UTC (rev 206623)
@@ -261,6 +261,11 @@
return false;
}
+ if (!protectedSourceBuffer) {
+ errorCode = MediaPlayer::InvalidPlayerState;
+ return false;
+ }
+
ASSERT(!m_sourceBuffers.isEmpty());
LOG(Media, "CDMSessionAVStreamSession::update(%p) - key data", this);
errorCode = MediaPlayer::NoError;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
