Changeset 259594 in webkit

Timestamp:

Apr 6, 2020, 1:53:56 PM (6 years ago)

Author:

jer.noble@apple.com

Message:

Strengthen the ASSERT in ImageDecoderAVFObjC::storeSampleBuffer().
​https://bugs.webkit.org/show_bug.cgi?id=209972
<rdar://problem/60727431>

Reviewed by Brent Fulgham.

• platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm:

(WebCore::ImageDecoderAVFObjC::storeSampleBuffer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-06  Jer Noble  <jer.noble@apple.com>
+
+        Strengthen the ASSERT in ImageDecoderAVFObjC::storeSampleBuffer().
+        https://bugs.webkit.org/show_bug.cgi?id=209972
+        <rdar://problem/60727431>
+
+        Reviewed by Brent Fulgham.
+
+        * platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm:
+        (WebCore::ImageDecoderAVFObjC::storeSampleBuffer):
+
 2020-04-06  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm

@@ -422 +422 @@
     auto pixelBuffer = m_decompressionSession->decodeSampleSync(sampleBuffer);
     if (!pixelBuffer) {
-        LOG(Images, "ImageDecoderAVFObjC::storeSampleBuffer(%p) - could not decode sampleBuffer", this);
+        RELEASE_LOG_ERROR(Images, "ImageDecoderAVFObjC::storeSampleBuffer(%p) - could not decode sampleBuffer", this);
         return false;
     }
@@ -434 +434 @@
     CGImageRef rawImage = nullptr;
     if (noErr != VTCreateCGImageFromCVPixelBuffer(pixelBuffer.get(), nullptr, &rawImage)) {
-        LOG(Images, "ImageDecoderAVFObjC::storeSampleBuffer(%p) - could not create CGImage from pixelBuffer", this);
+        RELEASE_LOG_ERROR(Images, "ImageDecoderAVFObjC::storeSampleBuffer(%p) - could not create CGImage from pixelBuffer", this);
         return false;
     }
 
     ASSERT(iter != m_sampleData.presentationOrder().end());
+    if (iter == m_sampleData.presentationOrder().end()) {
+        RELEASE_LOG_ERROR(Images, "ImageDecoderAVFObjC::storeSampleBuffer(%p) - could not find sample buffer entry with specified presentation time", this);
+        return false;
+    }
+
     toSample(iter)->setImage(adoptCF(rawImage));