commit c5eb97dd8875accf2b5db5343dace78d0d4c6f79
author Mike Reed <reed@google.com> Mon Oct 09 10:42:51 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 09 15:04:34 2017 +0000
tree 8b19795aabab39952b9fbaba699601470e4f35a0
parent c6b2e6b061a60f603345e936e6136050da3209aa

add helper to check for overflow

pre-CL to aid in changing the convention for when we overflow

Bug: skia:
Change-Id: I1e34a18fefb80187787a1c0c8ed7ee3516744d24
Reviewed-on: https://skia-review.googlesource.com/57103
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/image/SkImage.cpp

diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 705efae..7e1b238 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -423,7 +423,7 @@
 
     size_t rowBytes = info.minRowBytes();
     size_t size = info.computeByteSize(rowBytes);
-    if (size == 0) {
+    if (SkImageInfo::ByteSizeOverflowed(size)) {
         return nullptr;
     }
     auto data = SkData::MakeUninitialized(size);