Title: [169897] trunk/Source/WebCore
- Revision
- 169897
- Author
- [email protected]
- Date
- 2014-06-12 07:09:31 -0700 (Thu, 12 Jun 2014)
Log Message
[MSE][Mac] Crash in MediaSourcePrivateAVFObjC::naturalSize()
https://bugs.webkit.org/show_bug.cgi?id=133789
Reviewed by Eric Carlson.
Add null-check to proctect against being queried for the naturalSize before we have a
m_mediaSourcePrivate.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::naturalSize):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (169896 => 169897)
--- trunk/Source/WebCore/ChangeLog 2014-06-12 14:07:38 UTC (rev 169896)
+++ trunk/Source/WebCore/ChangeLog 2014-06-12 14:09:31 UTC (rev 169897)
@@ -1,3 +1,16 @@
+2014-06-12 Jer Noble <[email protected]>
+
+ [MSE][Mac] Crash in MediaSourcePrivateAVFObjC::naturalSize()
+ https://bugs.webkit.org/show_bug.cgi?id=133789
+
+ Reviewed by Eric Carlson.
+
+ Add null-check to proctect against being queried for the naturalSize before we have a
+ m_mediaSourcePrivate.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::naturalSize):
+
2014-06-12 Alberto Garcia <[email protected]>
[GTK] fails to build with --disable-webgl --disable-accelerated-compositing
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (169896 => 169897)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-06-12 14:07:38 UTC (rev 169896)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-06-12 14:09:31 UTC (rev 169897)
@@ -368,6 +368,9 @@
IntSize MediaPlayerPrivateMediaSourceAVFObjC::naturalSize() const
{
+ if (!m_mediaSourcePrivate)
+ return IntSize();
+
return m_mediaSourcePrivate->naturalSize();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
