Title: [242946] trunk/Source/WebCore
- Revision
- 242946
- Author
- jer.no...@apple.com
- Date
- 2019-03-14 11:22:04 -0700 (Thu, 14 Mar 2019)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (242945 => 242946)
--- trunk/Source/WebCore/ChangeLog 2019-03-14 17:41:04 UTC (rev 242945)
+++ trunk/Source/WebCore/ChangeLog 2019-03-14 18:22:04 UTC (rev 242946)
@@ -1,3 +1,16 @@
+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-14 Zalan Bujtas <za...@apple.com>
Cleanup inline boxes when list marker gets blockified
Modified: trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp (242945 => 242946)
--- trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp 2019-03-14 17:41:04 UTC (rev 242945)
+++ trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp 2019-03-14 18:22:04 UTC (rev 242946)
@@ -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
