PanasonicV8Decompressor: take image size, not image rectangle

Author: LebedevRI

fuzz/librawspeed/decompressors/PanasonicV8Decompressor.cpp

@@ -112,10 +112,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     auto stripHeights = stripHeightsInput.getVector<uint16_t>(numStripHeights);
     stripHeights.reserve(1); // Array1DRef does not like nullptr's.
 
-    const auto imgDim = iRectangle2D({0, 0}, mRaw->dim);
-
     PanasonicV8Decompressor::DecompressorParamsBuilder builder(
-        imgDim, initialPrediction, getAsArray1DRef(strips),
+        mRaw->dim, initialPrediction, getAsArray1DRef(strips),
         getAsArray1DRef(stripLineOffsets), getAsArray1DRef(stripWidths),
         getAsArray1DRef(stripHeights), defineCodes);
 

src/librawspeed/decoders/Rw2Decoder.cpp

@@ -250,10 +250,8 @@ RawImage Rw2Decoder::decodeRawV8(const TiffIFD& raw) const {
   const std::vector<Array1DRef<const uint8_t>> mStrips =
       getInputStrips(mParams, mFile);
 
-  const auto imgDim = iRectangle2D({0, 0}, mRaw->dim);
-
   PanasonicV8Decompressor::DecompressorParamsBuilder b(
-      imgDim, mParams.initialPrediction, getAsArray1DRef(mStrips),
+      mRaw->dim, mParams.initialPrediction, getAsArray1DRef(mStrips),
       getAsArray1DRef(mParams.stripLineOffsets),
       getAsArray1DRef(mParams.stripWidths),
       getAsArray1DRef(mParams.stripHeights),

src/librawspeed/decompressors/PanasonicV8Decompressor.cpp

@@ -167,10 +167,9 @@ evaluateConsecutiveTiles(const iRectangle2D rect, const iRectangle2D nextRect) {
   return Invalid;
 }
 
-void isValidImageGrid(iRectangle2D imgDim,
-                      Array1DRef<const iRectangle2D> rects) {
-  auto outPos = imgDim.pos;
-  invariant(outPos.x == 0 && outPos.y == 0);
+void isValidImageGrid(iPoint2D imgSize, Array1DRef<const iRectangle2D> rects) {
+  auto outPos = iPoint2D(0, 0);
+  const auto imgDim = iRectangle2D(outPos, imgSize);
 
   iRectangle2D rect = rects(0);
   if (rect.pos != outPos)
@@ -296,10 +295,10 @@ PanasonicV8Decompressor::DecompressorParamsBuilder::getDecoderLUT(
 
 std::vector<iRectangle2D>
 PanasonicV8Decompressor::DecompressorParamsBuilder::getOutRects(
-    iRectangle2D imgDim, Array1DRef<const uint32_t> stripLineOffsets,
+    iPoint2D imgSize, Array1DRef<const uint32_t> stripLineOffsets,
     Array1DRef<const uint16_t> stripWidths,
     Array1DRef<const uint16_t> stripHeights) {
-  if (!imgDim.hasPositiveArea())
+  if (!imgSize.hasPositiveArea())
     ThrowRDE("Empty image requested");
   const int totalStrips = stripLineOffsets.size();
   if (stripWidths.size() != totalStrips || stripHeights.size() != totalStrips)
@@ -317,6 +316,7 @@ PanasonicV8Decompressor::DecompressorParamsBuilder::getOutRects(
 
     const auto rect = iRectangle2D(iPoint2D(stripOutputX, stripOutputY),
                                    iPoint2D(stripWidth, stripHeight));
+    const auto imgDim = iRectangle2D({0, 0}, imgSize);
 
     if (!rect.isThisInside(imgDim))
       ThrowRDE("Tile isn't fully within the output image");
@@ -326,7 +326,7 @@ PanasonicV8Decompressor::DecompressorParamsBuilder::getOutRects(
     mOutRects.emplace_back(rect);
   }
 
-  isValidImageGrid(imgDim, getAsArray1DRef(mOutRects));
+  isValidImageGrid(imgSize, getAsArray1DRef(mOutRects));
   return mOutRects;
 }
 

src/librawspeed/decompressors/PanasonicV8Decompressor.h

@@ -98,20 +98,20 @@ class PanasonicV8Decompressor final : public AbstractDecompressor {
         ByteStream bs);
 
     std::vector<iRectangle2D> static getOutRects(
-        iRectangle2D imgDim, Array1DRef<const uint32_t> stripLineOffsets,
+        iPoint2D imgSize, Array1DRef<const uint32_t> stripLineOffsets,
         Array1DRef<const uint16_t> stripWidths,
         Array1DRef<const uint16_t> stripHeights);
 
     // NOLINTNEXTLINE(readability-function-size)
     DecompressorParamsBuilder(
-        iRectangle2D imgDim, Bayer2x2 initialPrediction_,
+        iPoint2D imgSize, Bayer2x2 initialPrediction_,
         Array1DRef<const Array1DRef<const uint8_t>> mStrips_,
         Array1DRef<const uint32_t> stripLineOffsets,
         Array1DRef<const uint16_t> stripWidths,
         Array1DRef<const uint16_t> stripHeights, ByteStream defineCodes)
         : mDecoderLUT(getDecoderLUT(defineCodes)), mStrips(mStrips_),
           initialPrediction(initialPrediction_),
-          mOutRects(getOutRects(imgDim, stripLineOffsets, stripWidths,
+          mOutRects(getOutRects(imgSize, stripLineOffsets, stripWidths,
                                 stripHeights)) {
       if (mStrips.size() != implicit_cast<int>(mOutRects.size()))
         ThrowRDE("Got different number of input strips vs output tiles");