commit b57b9310c0dd6e3f97dbfb415405b88ac22320e6
author Mike Reed <reed@google.com> Mon Apr 23 12:12:54 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Apr 23 17:08:01 2018 +0000
tree 9b18def416f3f6ca39b7516cae34e5344a00fac9
parent 381c953b82fdf58362182db67c6bea1b411392d3

use SkRect::outset, as it clamps on overflow

Bug: oss-fuzz:7929
Change-Id: Ic9a2582eb7ab638fda71b10bf987a6c584770e43
Reviewed-on: https://skia-review.googlesource.com/122959
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index fa2c08a..487aa41 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1578,12 +1578,10 @@
     }
 
     SkRect bounds;
-    SkRect r;
     // adjust it outwards in case we are antialiasing
-    const int inset = 1;
+    const int margin = 1;
 
-    r.iset(ibounds.fLeft - inset, ibounds.fTop - inset,
-           ibounds.fRight + inset, ibounds.fBottom + inset);
+    SkRect r = SkRect::Make(ibounds.makeOutset(margin, margin));
     inverse.mapRect(&bounds, r);
     return bounds;
 }