From 61e66867ae10451fd365a676747a2c853bdd723d Mon Sep 17 00:00:00 2001
From: Adrienne Walker <enne@chromium.org>
Date: Tue, 5 Jun 2018 13:09:09 -0700
Subject: Fix SkImageInfo::computeByteSize underflow

Bug: chromium: 819616
Change-Id: I9d4c079ad93518e45739fbb7d1abc32dedbb9c26
Reviewed-on: https://skia-review.googlesource.com/132281
Auto-Submit: Adrienne Walker <enne@chromium.org>
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
---
 src/core/SkImageInfo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/SkImageInfo.cpp b/src/core/SkImageInfo.cpp
index 7e08be2ab9..a743dbce70 100644
--- a/src/core/SkImageInfo.cpp
+++ b/src/core/SkImageInfo.cpp
@@ -65,7 +65,7 @@ size_t SkImageInfo::computeByteSize(size_t rowBytes) const {
         return 0;
     }
     SkSafeMath safe;
-    size_t bytes = safe.add(safe.mul(fHeight - 1, rowBytes),
+    size_t bytes = safe.add(safe.mul(safe.addInt(fHeight, -1), rowBytes),
                             safe.mul(fWidth, this->bytesPerPixel()));
     return safe ? bytes : SK_MaxSizeT;
 }
-- 
cgit v1.2.3