Move buffer size check to base class.

Refine size calculation.
KhronosGroup · Dec 29, 2023 · dab91cf · dab91cf
1 parent 29255c5
commit dab91cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/tools/imageio/imageinput.cc b/tools/imageio/imageinput.cc
@@ -314,7 +314,9 @@ ImageInput::readImage(void* pBuffer, size_t bufferByteCount,
 {
     const auto& targetFormat = format.isUnknown() ? spec().format() : format;
     size_t outScanlineByteCount
-           = targetFormat.basic.bytesPlane0 * spec().width();
+           = targetFormat.pixelByteCount() * spec().width();
+    if (bufferByteCount < outScanlineByteCount * spec().height())
+        throw buffer_too_small();
 
     uint8_t* pDst = static_cast<uint8_t*>(pBuffer);
     for (uint32_t y = 0; y < spec().height(); y++) {

diff --git a/tools/imageio/jpg.imageio/jpginput.cc b/tools/imageio/jpg.imageio/jpginput.cc
@@ -362,16 +362,10 @@ void JpegInput::readImage(void* bufferOut, size_t bufferByteCount,
                           uint subimage, uint miplevel,
                           const FormatDescriptor& format)
 {
-    const auto& targetFormat = format.isUnknown() ? spec().format() : format;
-    size_t outImageByteCount
-           = targetFormat.basic.bytesPlane0 * spec().width() * spec().height();
-    if (bufferByteCount < outImageByteCount)
-        throw buffer_too_small();
-
     pJd->begin_decoding();
     decodingBegun = true;
     ImageInput::readImage(bufferOut, bufferByteCount,
                           subimage, miplevel,
-                          targetFormat);
+                          format);
 }