commit ff2f380fd37a9b81bb1ac247c5232f1ea5487213
author Robert Phillips <robertphillips@google.com> Mon Nov 18 16:36:54 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 18 22:13:20 2019 +0000
tree b3d8a4c33041a9d22d8b069ddb8fbe21d8d5fd06
parent b1b14522dccb448b87b0674f601f912209a0e2ce

Only access the scissorState's rect when it is valid

It is odd asan/valgrind hasn't been complaining about this

Change-Id: I8e7952e6fc554450ff8c5c5940500f09be48d6b0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255144
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/ops/GrDrawPathOp.cpp

diff --git a/src/gpu/ops/GrDrawPathOp.cpp b/src/gpu/ops/GrDrawPathOp.cpp
index c0cc4d4..51f5291 100644
--- a/src/gpu/ops/GrDrawPathOp.cpp
+++ b/src/gpu/ops/GrDrawPathOp.cpp
@@ -89,7 +89,14 @@
 
 void GrDrawPathOp::onExecute(GrOpFlushState* state, const SkRect& chainBounds) {
     GrAppliedClip appliedClip = state->detachAppliedClip();
-    GrPipeline::FixedDynamicState fixedDynamicState(appliedClip.scissorState().rect());
+
+    GrPipeline::FixedDynamicState* fixedDynamicState = nullptr, storage;
+
+    if (appliedClip.scissorState().enabled()) {
+        storage.fScissorRect = appliedClip.scissorState().rect();
+        fixedDynamicState = &storage;
+    }
+
     GrPipeline pipeline(this->pipelineInitArgs(*state), this->detachProcessors(),
                         std::move(appliedClip));
     sk_sp<GrPathProcessor> pathProc(GrPathProcessor::Create(this->color(), this->viewMatrix()));
@@ -99,7 +106,7 @@
                               state->drawOpArgs().origin(),
                               &pipeline,
                               pathProc.get(),
-                              &fixedDynamicState,
+                              fixedDynamicState,
                               nullptr, 0,
                               GrPrimitiveType::kPath);