[M54] Improve ColorStopOptimizer safety
Could potentially access uninitialized memory.
M54 cherry-pick for http://crbug.com/647481
BUG=647481
TBR=brianosman@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2345343002
Review-Url: https://codereview.chromium.org/2345343002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
Review-Url: https://codereview.chromium.org/2405853002
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index eccc21a..58ef525 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -890,19 +890,19 @@
return sk_make_sp<SkTwoPointConicalGradient>(start, startRadius, end, endRadius,
flipGradient, desc);
} else {
- SkAutoSTArray<8, SkColor> colorsNew(colorCount);
- SkAutoSTArray<8, SkScalar> posNew(colorCount);
- for (int i = 0; i < colorCount; ++i) {
- colorsNew[i] = opt.fColors[colorCount - i - 1];
+ SkAutoSTArray<8, SkColor> colorsNew(opt.fCount);
+ SkAutoSTArray<8, SkScalar> posNew(opt.fCount);
+ for (int i = 0; i < opt.fCount; ++i) {
+ colorsNew[i] = opt.fColors[opt.fCount - i - 1];
}
if (pos) {
- for (int i = 0; i < colorCount; ++i) {
- posNew[i] = 1 - opt.fPos[colorCount - i - 1];
+ for (int i = 0; i < opt.fCount; ++i) {
+ posNew[i] = 1 - opt.fPos[opt.fCount - i - 1];
}
- desc_init(&desc, colorsNew.get(), posNew.get(), colorCount, mode, flags, localMatrix);
+ desc_init(&desc, colorsNew.get(), posNew.get(), opt.fCount, mode, flags, localMatrix);
} else {
- desc_init(&desc, colorsNew.get(), nullptr, colorCount, mode, flags, localMatrix);
+ desc_init(&desc, colorsNew.get(), nullptr, opt.fCount, mode, flags, localMatrix);
}
return sk_make_sp<SkTwoPointConicalGradient>(end, endRadius, start, startRadius,
