From af017418b369fd14cb009c5f4c82683fb59f6c87 Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Mon, 17 Oct 2016 17:43:23 +0000 Subject: Revert "Avoid integer overflow in SkIcoCodec" This reverts commit 20cba06a4bc9bde60b2dc37907d11ca81ba35ce8. Reason for revert: TBR=msarett@google.com,scroggo@google.com,kjlubick@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Id8f48a90a7dc620f9c0ee2f419d14bae2b0c1e7e Reviewed-on: https://skia-review.googlesource.com/3564 Commit-Queue: Matt Sarett Reviewed-by: Matt Sarett --- resources/invalid_images/int_overflow.ico | Bin 323 -> 0 bytes src/codec/SkIcoCodec.cpp | 9 ++++----- tests/CodecTest.cpp | 7 ------- 3 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 resources/invalid_images/int_overflow.ico diff --git a/resources/invalid_images/int_overflow.ico b/resources/invalid_images/int_overflow.ico deleted file mode 100644 index 24a7c701f9..0000000000 Binary files a/resources/invalid_images/int_overflow.ico and /dev/null differ diff --git a/src/codec/SkIcoCodec.cpp b/src/codec/SkIcoCodec.cpp index d01904dc1b..63b72c4039 100644 --- a/src/codec/SkIcoCodec.cpp +++ b/src/codec/SkIcoCodec.cpp @@ -157,12 +157,11 @@ SkCodec* SkIcoCodec::NewFromStream(SkStream* stream) { } // Use the largest codec as a "suggestion" for image info - size_t maxSize = 0; - int maxIndex = 0; - for (int i = 0; i < codecs->count(); i++) { + uint32_t maxSize = 0; + uint32_t maxIndex = 0; + for (int32_t i = 0; i < codecs->count(); i++) { SkImageInfo info = codecs->operator[](i)->getInfo(); - size_t size = info.getSafeSize(info.minRowBytes()); - + uint32_t size = info.width() * info.height(); if (size > maxSize) { maxSize = size; maxIndex = i; diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index a6058a9c35..4d18c61860 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -1362,10 +1362,3 @@ DEF_TEST(Codec_rowsDecoded, r) { REPORTER_ASSERT(r, result == SkCodec::kIncompleteInput); REPORTER_ASSERT(r, rowsDecoded == 0); } - -DEF_TEST(Codec_IcoIntOverflow, r) { - // ASAN will complain if there is an issue. - SkBitmap bitmap; - const bool success = GetResourceAsBitmap("invalid_images/int_overflow.ico", &bitmap); - REPORTER_ASSERT(r, !success); -} -- cgit v1.2.3