src/pathops/SkPathOpsOp.cpp - Issue 623943002: abort op early if path isn't parseable

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/pathops/SkPathOpsOp.cpp

Issue 623943002: abort op early if path isn't parseable (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 2 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/pathops/SkPathOpsOp.cpp

diff --git a/src/pathops/SkPathOpsOp.cpp b/src/pathops/SkPathOpsOp.cpp

index 4c6923abb60b46d75d53dc13edeed9183a70480c..72efb89d101409c24a858813df1c3b1bf607d139 100644

--- a/src/pathops/SkPathOpsOp.cpp

+++ b/src/pathops/SkPathOpsOp.cpp

@@ -270,6 +270,9 @@ bool Op(const SkPath& one, const SkPath& two, SkPathOp op, SkPath* result) {

SkTArray<SkOpContour> contours;

// FIXME: add self-intersecting cubics' T values to segment

SkOpEdgeBuilder builder(*minuend, contours);

+ if (builder.unparseable()) {

+ return false;

+ }

const int xorMask = builder.xorMask();

builder.addOperand(*subtrahend);

if (!builder.finish()) {

« no previous file with comments | « src/pathops/SkOpEdgeBuilder.h ('k') | tests/PathOpsOpTest.cpp » ('j') | no next file with comments »