diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2017-07-06 12:26:09 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-06 16:49:36 +0000 |
| commit | 674a1848ae62277ea9a2d022b60aa1f17d306f17 (patch) | |
| tree | 0f1b7396e4a7c3d2c561fd96969063e51062faaa /fuzz/fuzz.cpp | |
| parent | 005a970eb9d70e729cdebf0f79551577b112aa7b (diff) | |
Add SkCodec::Result indicating error in the data
Previously, SkGifCodec treated an error in the LZW data as incomplete,
since we can still draw the partially decoded image. But a client doing
incremental decodes needs to distinguish this from truly incomplete
data. In the case of an error, the client should not attempt to provide
more data and decode again.
Add kErrorInInput, and return it when SkGifCodec sees a fatal error.
Treat it the same as kIncompleteInput when it comes to filling and DM.
Bug: skia:6825
Change-Id: Ic6ce3a62c0b065ed34dcd8006309e43272a3db9f
Reviewed-on: https://skia-review.googlesource.com/21530
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Chris Blume <cblume@chromium.org>
Diffstat (limited to 'fuzz/fuzz.cpp')
| -rw-r--r-- | fuzz/fuzz.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fuzz/fuzz.cpp b/fuzz/fuzz.cpp index 8e2a73376f..d451481049 100644 --- a/fuzz/fuzz.cpp +++ b/fuzz/fuzz.cpp @@ -243,6 +243,9 @@ static void fuzz_img(sk_sp<SkData> bytes, uint8_t scale, uint8_t mode) { case SkCodec::kIncompleteInput: SkDebugf("[terminated] Partial Success\n"); break; + case SkCodec::kErrorInInput: + SkDebugf("[terminated] Partial Success with error\n"); + break; case SkCodec::kInvalidConversion: SkDebugf("Incompatible colortype conversion\n"); // Crash to allow afl-fuzz to know this was a bug. @@ -376,6 +379,7 @@ static void fuzz_img(sk_sp<SkData> bytes, uint8_t scale, uint8_t mode) { switch (result) { case SkCodec::kSuccess: case SkCodec::kIncompleteInput: + case SkCodec::kErrorInInput: SkDebugf("okay\n"); break; case SkCodec::kInvalidConversion: @@ -428,7 +432,7 @@ static void fuzz_img(sk_sp<SkData> bytes, uint8_t scale, uint8_t mode) { } result = codec->incrementalDecode(); - if (result == SkCodec::kIncompleteInput) { + if (result == SkCodec::kIncompleteInput || result == SkCodec::kErrorInInput) { SkDebugf("okay\n"); // Frames beyond this one will not decode. break; |