diff options
| author |  Matt Sarett <msarett@google.com> | 2017-04-26 10:59:48 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-26 17:43:38 +0000 |
| commit | d59948a1714fe32729c77e3ea54e0992d48e8541 (patch) | |
| tree | 77c48bc054b6426eddd75e378178317321161418 /src/codec/SkPngCodec.h | |
| parent | ee683655a9a9d57487ab8d4b0b01bb9bc2def144 (diff) | |
SkPngCodec: Do not return kInvalidConversion on corrupt png
In this case, the fuzzer thinks there is a bug because we are
returning kInvalidConversion for a corrupt png file.
Bug: skia:6550
Change-Id: I33f588442f5eaa8a4d642e9328750779f9a9ef5d
Reviewed-on: https://skia-review.googlesource.com/14324
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/codec/SkPngCodec.h')
| -rw-r--r-- | src/codec/SkPngCodec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/codec/SkPngCodec.h b/src/codec/SkPngCodec.h index 4809723db6..d729fb11da 100644 --- a/src/codec/SkPngCodec.h +++ b/src/codec/SkPngCodec.h @@ -103,8 +103,8 @@ private: bool createColorTable(const SkImageInfo& dstInfo, int* ctableCount); // Helper to set up swizzler, color xforms, and color table. Also calls png_read_update_info. - bool initializeXforms(const SkImageInfo& dstInfo, const Options&, SkPMColor* colorPtr, - int* colorCount); + SkCodec::Result initializeXforms(const SkImageInfo& dstInfo, const Options&, + SkPMColor* colorPtr, int* colorCount); void initializeSwizzler(const SkImageInfo& dstInfo, const Options&, bool skipFormatConversion); void allocateStorage(const SkImageInfo& dstInfo); void destroyReadStruct(); |