Changeset 243575 in webkit

Timestamp:

Mar 27, 2019, 4:43:46 PM (7 years ago)

Author:

Alan Coon

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

Location:

branches/safari-607-branch/Source/WebCore

Files:

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

branches/safari-607-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-27  Alan Coon  <alancoon@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.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-27  Alan Coon  <alancoon@apple.com>
 

branches/safari-607-branch/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;