AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not create an SkRawCodec with zero dimensions

Browse Source 
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>
This commit is contained in:
Leon Scroggins III 2016-12-02 16:47:53 -05:00 committed by Skia Commit-Bot
parent 51d77ffdc6
commit d87fbee775
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/empty_images/zero_height.tiff Normal file
View File

Binary file not shown.

21
src/codec/SkRawCodec.cpp
View File

@ -553,7 +553,7 @@ private:
return 0x2A == get_endian_short(header + 2, littleEndian);
}
void init(int width, int height, const dng_point& cfaPatternSize) {
bool init(int width, int height, const dng_point& cfaPatternSize) {
fWidth = width;
fHeight = height;
@ -561,6 +561,8 @@ private:
// 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() {
@ -570,15 +572,9 @@ private:
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;
}
@ -606,10 +602,9 @@ private:
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;
}

3
tests/CodecTest.cpp
View File

@ -648,6 +648,9 @@ DEF_TEST(Codec_Empty, r) {
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[]) {