src/utils/SkGatherPixelRefsAndRects.h - Issue 833943002: It is dangerous to ignore SkRect::intersect's return value

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/utils/SkGatherPixelRefsAndRects.h

Issue 833943002: It is dangerous to ignore SkRect::intersect's return value (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Update Created 5 years, 12 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/utils/SkGatherPixelRefsAndRects.h

diff --git a/src/utils/SkGatherPixelRefsAndRects.h b/src/utils/SkGatherPixelRefsAndRects.h

index 6e11fbe6d58a350f1c8008187a4114f0d3e96d6e..9589c3ea3852ba8a5fb2ffeccc13d47823c9186b 100644

--- a/src/utils/SkGatherPixelRefsAndRects.h

+++ b/src/utils/SkGatherPixelRefsAndRects.h

@@ -79,8 +79,9 @@ protected:

SkRect mappedRect;

draw.fMatrix->mapRect(&mappedRect, rect);

SkRect clipRect = SkRect::Make(draw.fRC->getBounds());

- mappedRect.intersect(clipRect);

- fPRCont->add(bm.pixelRef(), mappedRect);

+ if (mappedRect.intersect(clipRect)) {

+ fPRCont->add(bm.pixelRef(), mappedRect);

+ }

}

virtual void drawOval(const SkDraw& draw, const SkRect& rect,

« no previous file with comments | « src/gpu/GrReducedClip.cpp ('k') | no next file » | no next file with comments »