Title: [243575] branches/safari-607-branch/Source/WebCore
- Revision
- 243575
- Author
- alanc...@apple.com
- Date
- 2019-03-27 16:43:46 -0700 (Wed, 27 Mar 2019)
Log Message
Cherry-pick r242946. rdar://problem/49308005
Certain videos are causing a crash when used as WebGL texture
https://bugs.webkit.org/show_bug.cgi?id=195700
<rdar://problem/48869347>
Reviewed by Eric Carlson.
CFEqual is not null-safe, so perform a null and type check before comparing.
* platform/graphics/cv/VideoTextureCopierCV.cpp:
(WebCore::transferFunctionFromString):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242946 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (243574 => 243575)
--- branches/safari-607-branch/Source/WebCore/ChangeLog 2019-03-27 23:43:43 UTC (rev 243574)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-03-27 23:43:46 UTC (rev 243575)
@@ -1,5 +1,36 @@
2019-03-27 Alan Coon <alanc...@apple.com>
+ Cherry-pick r242946. rdar://problem/49308005
+
+ Certain videos are causing a crash when used as WebGL texture
+ https://bugs.webkit.org/show_bug.cgi?id=195700
+ <rdar://problem/48869347>
+
+ Reviewed by Eric Carlson.
+
+ CFEqual is not null-safe, so perform a null and type check before comparing.
+
+ * platform/graphics/cv/VideoTextureCopierCV.cpp:
+ (WebCore::transferFunctionFromString):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242946 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-03-14 Jer Noble <jer.no...@apple.com>
+
+ Certain videos are causing a crash when used as WebGL texture
+ https://bugs.webkit.org/show_bug.cgi?id=195700
+ <rdar://problem/48869347>
+
+ Reviewed by Eric Carlson.
+
+ CFEqual is not null-safe, so perform a null and type check before comparing.
+
+ * platform/graphics/cv/VideoTextureCopierCV.cpp:
+ (WebCore::transferFunctionFromString):
+
+2019-03-27 Alan Coon <alanc...@apple.com>
+
Cherry-pick r242921. rdar://problem/49308071
[WeakPtr] RenderListMarker::m_listItem should be a WeakPtr
Modified: branches/safari-607-branch/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp (243574 => 243575)
--- branches/safari-607-branch/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp 2019-03-27 23:43:43 UTC (rev 243574)
+++ branches/safari-607-branch/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp 2019-03-27 23:43:46 UTC (rev 243575)
@@ -99,6 +99,8 @@
static TransferFunction transferFunctionFromString(CFStringRef string)
{
+ if (!string || CFGetTypeID(string) != CFStringGetTypeID())
+ return TransferFunction::Unknown;
if (CFEqual(string, kCVImageBufferYCbCrMatrix_ITU_R_709_2))
return TransferFunction::kITU_R_709_2;
if (CFEqual(string, kCVImageBufferYCbCrMatrix_ITU_R_601_4))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
