Title: [210343] branches/safari-603-branch/Source/WebCore
- Revision
- 210343
- Author
- [email protected]
- Date
- 2017-01-05 09:09:05 -0800 (Thu, 05 Jan 2017)
Log Message
Merge r210061. rdar://problem/29763143
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210342 => 210343)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 17:09:02 UTC (rev 210342)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 17:09:05 UTC (rev 210343)
@@ -1,5 +1,25 @@
2017-01-05 Matthew Hanson <[email protected]>
+ Merge r210061. rdar://problem/29763143
+
+ 2016-12-21 Eric Carlson <[email protected]>
+
+ [MediaStream] MediaPlayerPrivateMediaStreamAVFObjC::ensureLayer can be called before it has a media stream
+ https://bugs.webkit.org/show_bug.cgi?id=166344
+ <rdar://problem/29763143>
+
+ Reviewed by Jer Noble.
+
+ There is a very narrow window during which a MediaStream player can be asked for its layer
+ before it has a steam, resulting in a NULL dereference and crash. Don't do that.
+
+ Unable to reproduce.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::ensureLayer):
+
+2017-01-05 Matthew Hanson <[email protected]>
+
Merge r210059. rdar://problem/29727145
2016-12-21 Simon Fraser <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (210342 => 210343)
--- branches/safari-603-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-01-05 17:09:02 UTC (rev 210342)
+++ branches/safari-603-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-01-05 17:09:05 UTC (rev 210343)
@@ -197,7 +197,7 @@
void MediaPlayerPrivateMediaStreamAVFObjC::ensureLayer()
{
- if (haveVideoLayer())
+ if (!m_mediaStreamPrivate || haveVideoLayer())
return;
CALayer *videoLayer = nil;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
