commit 0a3c57f1adf9d709463bf65f093518775ab48708
author Brian Osman <brianosman@google.com> Wed Feb 05 13:13:32 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Feb 05 18:52:17 2020 +0000
tree 38542a33b23b558f70fb1ebfd279bf0ced35c7d3
parent ba51d6859e272da4a47c1722358a1a1560d830ab

Ensure that ArithmeticFPInputs is fully initialized

Change-Id: Ia5e94704955aba33e07592711656fbeefef15912
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/268840
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

include/effects/SkArithmeticImageFilter.h

diff --git a/include/effects/SkArithmeticImageFilter.h b/include/effects/SkArithmeticImageFilter.h
index 84c2765..43d53a2 100644
--- a/include/effects/SkArithmeticImageFilter.h
+++ b/include/effects/SkArithmeticImageFilter.h
@@ -11,6 +11,15 @@
 #include "include/core/SkImageFilter.h"
 
 struct ArithmeticFPInputs {
+    ArithmeticFPInputs(float k0, float k1, float k2, float k3, bool enforcePMColor) {
+        memset(this, 0, sizeof(*this));
+        fK[0] = k0;
+        fK[1] = k1;
+        fK[2] = k2;
+        fK[3] = k3;
+        fEnforcePMColor = enforcePMColor;
+    }
+
     float fK[4];
     bool  fEnforcePMColor;
 };

src/effects/imagefilters/SkArithmeticImageFilter.cpp

diff --git a/src/effects/imagefilters/SkArithmeticImageFilter.cpp b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
index 4b25966..5f2a20e 100644
--- a/src/effects/imagefilters/SkArithmeticImageFilter.cpp
+++ b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
@@ -52,7 +52,7 @@
 public:
     ArithmeticImageFilterImpl(float k1, float k2, float k3, float k4, bool enforcePMColor,
                               sk_sp<SkImageFilter> inputs[2], const CropRect* cropRect)
-            : INHERITED(inputs, 2, cropRect), fInputs{{k1, k2, k3, k4}, enforcePMColor} {}
+            : INHERITED(inputs, 2, cropRect), fInputs{k1, k2, k3, k4, enforcePMColor} {}
 
 protected:
     sk_sp<SkSpecialImage> onFilterImage(const Context&, SkIPoint* offset) const override;

src/gpu/effects/GrSkSLFP.cpp

diff --git a/src/gpu/effects/GrSkSLFP.cpp b/src/gpu/effects/GrSkSLFP.cpp
index 9e0d1da..309f8a3 100644
--- a/src/gpu/effects/GrSkSLFP.cpp
+++ b/src/gpu/effects/GrSkSLFP.cpp
@@ -279,12 +279,8 @@
         }
         case 1: {
             static auto effect = std::get<0>(SkRuntimeEffect::Make(SkString(SKSL_ARITHMETIC_SRC)));
-            ArithmeticFPInputs inputs;
-            inputs.fK[0] = d->fRandom->nextF();
-            inputs.fK[1] = d->fRandom->nextF();
-            inputs.fK[2] = d->fRandom->nextF();
-            inputs.fK[3] = d->fRandom->nextF();
-            inputs.fEnforcePMColor = d->fRandom->nextBool();
+            ArithmeticFPInputs inputs{d->fRandom->nextF(), d->fRandom->nextF(), d->fRandom->nextF(),
+                                      d->fRandom->nextF(), d->fRandom->nextBool()};
             auto result = GrSkSLFP::Make(d->context(), effect, "Arithmetic",
                                          SkData::MakeWithCopy(&inputs, sizeof(inputs)));
             result->addChild(GrConstColorProcessor::Make(