From e0b728726d3b44bf18219b8c5bc5599332be7c34 Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Wed, 12 Apr 2017 12:03:15 -0400 Subject: fix drawDRRect for fuzzer make assert abort instead Bug: skia:6450 Change-Id: I23ff51124fa8f069f2c7e5260f800017d7475d46 Reviewed-on: https://skia-review.googlesource.com/13197 Commit-Queue: Cary Clark Reviewed-by: Hal Canary --- src/core/SkCanvas.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index aa69f09f47..8cef3353a2 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1770,11 +1770,13 @@ void SkCanvas::drawDRRect(const SkRRect& outer, const SkRRect& inner, } // We don't have this method (yet), but technically this is what we should - // be able to assert... - // SkASSERT(outer.contains(inner)); + // be able to return ... + // if (!outer.contains(inner))) { // // For now at least check for containment of bounds - SkASSERT(outer.getBounds().contains(inner.getBounds())); + if (!outer.getBounds().contains(inner.getBounds())) { + return; + } this->onDrawDRRect(outer, inner, paint); } -- cgit v1.2.3