DO NOT MERGE Do not create an SkRawCodec with zero dimensions
BUG:33300701
Cherry-pick of Ifb3a824a36998c5e626c4ad58466845f49d18ebf
Conflicts:
src/codec/SkRawCodec.cpp
Original message:
"""
DO NOT MERGE Do not create an SkRawCodec with zero dimensions
Add a test
BUG=skia:3534
BUG=b/33300701
Change-Id: Ifb3a824a36998c5e626c4ad58466845f49d18ebf
Reviewed-on: https://skia-review.googlesource.com/5568
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
"""
(cherry picked from commit 20de35a0fd855c60b40a7d5d513bbe8e19fda49b)
diff --git a/resources/empty_images/zero_height.tiff b/resources/empty_images/zero_height.tiff
new file mode 100644
index 0000000..ea7a477
--- /dev/null
+++ b/resources/empty_images/zero_height.tiff
Binary files differ
diff --git a/src/codec/SkRawCodec.cpp b/src/codec/SkRawCodec.cpp
index ab2c55d..eea551e 100644
--- a/src/codec/SkRawCodec.cpp
+++ b/src/codec/SkRawCodec.cpp
@@ -542,13 +542,15 @@
(header[0] == 0x4D && header[1] == 0x4D && header[2] == 0x00 && header[3] == 0x2A);
}
- void init(const int width, const int height, const dng_point& cfaPatternSize) {
+ bool init(const int width, const int height, const dng_point& cfaPatternSize) {
fImageInfo = SkImageInfo::Make(width, height, kN32_SkColorType, kOpaque_SkAlphaType);
// The DNG SDK scales only during demosaicing, so scaling is only possible when
// a mosaic info is available.
fIsScalable = cfaPatternSize.v != 0 && cfaPatternSize.h != 0;
fIsXtransImage = fIsScalable ? (cfaPatternSize.v == 6 && cfaPatternSize.h == 6) : false;
+
+ return width > 0 && height > 0;
}
bool initFromPiex() {
@@ -558,15 +560,9 @@
if (::piex::IsRaw(&piexStream)
&& ::piex::GetPreviewImageData(&piexStream, &imageData) == ::piex::Error::kOk)
{
- // Verify the size information, as it is only optional information for PIEX.
- if (imageData.full_width == 0 || imageData.full_height == 0) {
- return false;
- }
-
dng_point cfaPatternSize(imageData.cfa_pattern_dim[1], imageData.cfa_pattern_dim[0]);
- this->init(static_cast<int>(imageData.full_width),
- static_cast<int>(imageData.full_height), cfaPatternSize);
- return true;
+ return this->init(static_cast<int>(imageData.full_width),
+ static_cast<int>(imageData.full_height), cfaPatternSize);
}
return false;
}
@@ -594,10 +590,9 @@
if (fNegative->GetMosaicInfo() != nullptr) {
cfaPatternSize = fNegative->GetMosaicInfo()->fCFAPatternSize;
}
- this->init(static_cast<int>(fNegative->DefaultCropSizeH().As_real64()),
- static_cast<int>(fNegative->DefaultCropSizeV().As_real64()),
- cfaPatternSize);
- return true;
+ return this->init(static_cast<int>(fNegative->DefaultCropSizeH().As_real64()),
+ static_cast<int>(fNegative->DefaultCropSizeV().As_real64()),
+ cfaPatternSize);
} catch (...) {
return false;
}
diff --git a/tests/CodexTest.cpp b/tests/CodexTest.cpp
index 8ce6302..7e6d950 100644
--- a/tests/CodexTest.cpp
+++ b/tests/CodexTest.cpp
@@ -628,6 +628,9 @@
test_invalid(r, "empty_images/zero-height.wbmp");
// This image is an ico with an embedded mask-bmp. This is illegal.
test_invalid(r, "invalid_images/mask-bmp-ico.ico");
+#if defined(SK_CODEC_DECODES_RAW) && (!defined(_WIN32))
+ test_invalid(r, "empty_images/zero_height.tiff");
+#endif
}
static void test_invalid_parameters(skiatest::Reporter* r, const char path[]) {
