diff options
| -rw-r--r-- | resources/invalid_images/b38116746.ico | bin | 0 -> 1024 bytes | |||
| -rw-r--r-- | src/codec/SkIcoCodec.cpp | 11 | ||||
| -rw-r--r-- | tests/BadIcoTest.cpp | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/resources/invalid_images/b38116746.ico b/resources/invalid_images/b38116746.ico Binary files differnew file mode 100644 index 0000000000..35ee5b5a28 --- /dev/null +++ b/resources/invalid_images/b38116746.ico diff --git a/src/codec/SkIcoCodec.cpp b/src/codec/SkIcoCodec.cpp index 9ea092efc0..9d424f3e4e 100644 --- a/src/codec/SkIcoCodec.cpp +++ b/src/codec/SkIcoCodec.cpp @@ -128,11 +128,18 @@ SkCodec* SkIcoCodec::NewFromStream(SkStream* stream) { bytesRead = offset; // Create a new stream for the embedded codec - sk_sp<SkData> data(SkData::MakeFromStream(inputStream.get(), size)); - if (nullptr == data.get()) { + SkAutoFree buffer(sk_malloc_flags(size, 0)); + if (!buffer) { + SkCodecPrintf("Warning: OOM trying to create embedded stream.\n"); + break; + } + + if (inputStream->read(buffer.get(), size) != size) { SkCodecPrintf("Warning: could not create embedded stream.\n"); break; } + + sk_sp<SkData> data(SkData::MakeFromMalloc(buffer.release(), size)); std::unique_ptr<SkMemoryStream> embeddedStream(new SkMemoryStream(data)); bytesRead += size; diff --git a/tests/BadIcoTest.cpp b/tests/BadIcoTest.cpp index 229e9bc44e..670c2ac311 100644 --- a/tests/BadIcoTest.cpp +++ b/tests/BadIcoTest.cpp @@ -24,6 +24,7 @@ DEF_TEST(BadImage, reporter) { "ico_fuzz1.ico", "skbug3442.webp", "skbug3429.webp", + "b38116746.ico", }; const char* badImagesFolder = "invalid_images"; |