Changeset 295734 in webkit

Timestamp:

Jun 22, 2022, 10:11:51 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

CVPixelBufferGetBytePointerCallback should check for CVPixelBufferGetBaseAddress returning nullptr
​https://bugs.webkit.org/show_bug.cgi?id=241845
rdar://95622853

Patch by Youenn Fablet <​youennf@gmail.com> on 2022-06-22
Reviewed by Eric Carlson.

CVPixelBufferGetBaseAddress may return nullptr in some cases.
In that case, return early.

• Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.cpp:

(WebCore::CVPixelBufferGetBytePointerCallback):

Canonical link: ​https://commits.webkit.org/251739@main

File:

• trunk/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.cpp (modified) (1 diff)

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

@@ -71 +71 @@
     ++info->lockCount;
     void* address = CVPixelBufferGetBaseAddress(info->pixelBuffer.get());
+    if (!address) {
+        RELEASE_LOG_ERROR(Media, "CVPixelBufferGetBaseAddress returned null");
+        RELEASE_LOG_STACKTRACE(Media);
+        return nullptr;
+    }
+
     size_t byteLength = CVPixelBufferGetBytesPerRow(info->pixelBuffer.get()) * CVPixelBufferGetHeight(info->pixelBuffer.get());