LJpegDecoder: check that frame/tile areas match, not dimensions

darktable-org · Mar 25, 2024 · 3ee4910 · 3ee4910
1 parent 8297c38
commit 3ee4910
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/librawspeed/decompressors/LJpegDecoder.cpp b/src/librawspeed/decompressors/LJpegDecoder.cpp
@@ -128,9 +128,9 @@ Buffer::size_type LJpegDecoder::decodeScan() {
   const LJpegDecompressor::Frame jpegFrame = {N_COMP,
                                               iPoint2D(frame.w, frame.h)};
 
-  if (iPoint2D(mRaw->getCpp() * maxDim.x, maxDim.y) !=
-      iPoint2D(N_COMP * frame.w, frame.h))
-    ThrowRDE("LJpeg frame does not match maximal tile size");
+  auto maxRes = iPoint2D(mRaw->getCpp() * maxDim.x, maxDim.y);
+  if (maxRes.area() != N_COMP * jpegFrame.dim.area())
+    ThrowRDE("LJpeg frame area does not match maximal tile area");
 
   int numRowsPerRestartInterval;
   if (numMCUsPerRestartInterval == 0) {