diff options
| author |  tomhudson <tomhudson@google.com> | 2016-09-16 14:22:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-16 14:22:49 -0700 |
| commit | 54d9b6688d3f023c40726c0ea1ab2629e54ab306 (patch) | |
| tree | 3a170bfc74fe26a0fbf8a81cda781acffe937017 | |
| parent | b6318bf44dd89dc8465dcf48ba820701eae24acb (diff) | |
Improve ColorStopOptimizer safety
Could potentially access uninitialized memory.
BUG=647481
R=brianosman@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2345343002
Review-Url: https://codereview.chromium.org/2345343002
| -rw-r--r-- | src/effects/gradients/SkGradientShader.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index 749d1751e2..3a28da8099 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -845,19 +845,19 @@ sk_sp<SkShader> SkGradientShader::MakeTwoPointConical(const SkPoint& start, 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, |