Changeset 242946 in webkit

Timestamp:

Mar 14, 2019, 11:22:04 AM (7 years ago)

Author:

jer.noble@apple.com

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cv/VideoTextureCopierCV.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-14  Jer Noble  <jer.noble@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  <zalan@apple.com>
 

trunk/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp

@@ -100 +100 @@
 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;