PanasonicV8Decompressor: ensure that we are asked to produce the same image size we've checked for

Author: LebedevRI

fuzz/librawspeed/decompressors/PanasonicV8Decompressor.cpp

@@ -86,6 +86,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     auto stripHeightsInput = bs.getStream(numStripHeights, sizeof(uint16_t));
     auto defineCodes = bs.getStream(numDefineCodesSize);
     const auto initialPrediction = bs.getArray<uint16_t, 4>();
+    const auto imgDim = bs.getArray<int, 2>();
 
     // The rest of the bs are the input strips.
 
@@ -113,7 +114,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* Data, size_t Size) {
     stripHeights.reserve(1); // Array1DRef does not like nullptr's.
 
     PanasonicV8Decompressor::DecompressorParamsBuilder builder(
-        mRaw->dim, initialPrediction, getAsArray1DRef(strips),
+        {imgDim[0], imgDim[1]}, initialPrediction, getAsArray1DRef(strips),
         getAsArray1DRef(stripLineOffsets), getAsArray1DRef(stripWidths),
         getAsArray1DRef(stripHeights), defineCodes);
 

src/librawspeed/decompressors/PanasonicV8Decompressor.cpp

@@ -347,7 +347,7 @@ PanasonicV8Decompressor::PanasonicV8Decompressor(RawImage outputImg,
       mRawOutput->getBpp() != sizeof(uint16_t)) {
     ThrowRDE("Unexpected component count / data type");
   }
-  if (!mRawOutput->dim.hasPositiveArea())
+  if (mRawOutput->dim != mParams.imgSize)
     ThrowRDE("Unexpected image dimensions");
   const auto maxBpp = maxBitsPerPixelNeeded(mParams.mDecoderLUT);
   if (maxBpp > 32) {

src/librawspeed/decompressors/PanasonicV8Decompressor.h

@@ -69,6 +69,7 @@ class PanasonicV8Decompressor final : public AbstractDecompressor {
   struct DecompressorParamsBuilder;
 
   struct DecompressorParams {
+    iPoint2D imgSize;
     const Array1DRef<const Array1DRef<const uint8_t>> mStrips;
     const Array1DRef<const iRectangle2D> mOutRect;
     const Array1DRef<const DecoderLUTEntry> mDecoderLUT;
@@ -79,15 +80,17 @@ class PanasonicV8Decompressor final : public AbstractDecompressor {
   private:
     friend struct DecompressorParamsBuilder;
 
-    DecompressorParams(Array1DRef<const Array1DRef<const uint8_t>> mStrips_,
+    DecompressorParams(iPoint2D imgSize_,
+                       Array1DRef<const Array1DRef<const uint8_t>> mStrips_,
                        Array1DRef<const iRectangle2D> mOutRect_,
                        Array1DRef<const DecoderLUTEntry> mDecoderLUT_,
                        Bayer2x2 initialPrediction_)
-        : mStrips(mStrips_), mOutRect(mOutRect_), mDecoderLUT(mDecoderLUT_),
-          initialPrediction(initialPrediction_) {}
+        : imgSize(imgSize_), mStrips(mStrips_), mOutRect(mOutRect_),
+          mDecoderLUT(mDecoderLUT_), initialPrediction(initialPrediction_) {}
   };
 
   struct DecompressorParamsBuilder {
+    iPoint2D imgSize;
     const std::vector<PanasonicV8Decompressor::DecoderLUTEntry> mDecoderLUT;
     const Array1DRef<const Array1DRef<const uint8_t>> mStrips;
     const Bayer2x2 initialPrediction;
@@ -104,13 +107,13 @@ class PanasonicV8Decompressor final : public AbstractDecompressor {
 
     // NOLINTNEXTLINE(readability-function-size)
     DecompressorParamsBuilder(
-        iPoint2D imgSize, 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_),
+        : imgSize(imgSize_), mDecoderLUT(getDecoderLUT(defineCodes)),
+          mStrips(mStrips_), initialPrediction(initialPrediction_),
           mOutRects(getOutRects(imgSize, stripLineOffsets, stripWidths,
                                 stripHeights)) {
       if (mStrips.size() != implicit_cast<int>(mOutRects.size()))
@@ -122,8 +125,8 @@ class PanasonicV8Decompressor final : public AbstractDecompressor {
     }
 
     [[nodiscard]] DecompressorParams getDecompressorParams() const {
-      return {mStrips, getAsArray1DRef(mOutRects), getAsArray1DRef(mDecoderLUT),
-              initialPrediction};
+      return {imgSize, mStrips, getAsArray1DRef(mOutRects),
+              getAsArray1DRef(mDecoderLUT), initialPrediction};
     }
   };