From b57b9310c0dd6e3f97dbfb415405b88ac22320e6 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 23 Apr 2018 12:12:54 -0400 Subject: 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 Reviewed-by: Mike Klein Commit-Queue: Mike Reed --- src/core/SkCanvas.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index fa2c08a420..487aa41386 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1578,12 +1578,10 @@ SkRect SkCanvas::getLocalClipBounds() const { } 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; } -- cgit v1.2.3