src/effects/gradients/SkLinearGradient.cpp - Issue 23706003: Fix case where GrGLEffectMatrix gives back a dangling ptr for the coords var name.

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/effects/gradients/SkLinearGradient.cpp

Issue 23706003: Fix case where GrGLEffectMatrix gives back a dangling ptr for the coords var name. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years, 4 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:

View side-by-side diff with in-line comments

Download patch

« src/core/SkXfermode.cpp ('K') | « src/effects/gradients/SkGradientShaderPriv.h ('k') | src/effects/gradients/SkRadialGradient.cpp » ('j') | src/effects/gradients/SkRadialGradient.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/effects/gradients/SkLinearGradient.cpp

diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp

index 2f56cb49ca21c2b4443663a5259def64bf31f24d..cc25957b0e645fc31b977ddfbd5282611f4c3496 100644

--- a/src/effects/gradients/SkLinearGradient.cpp

+++ b/src/effects/gradients/SkLinearGradient.cpp

@@ -525,10 +525,10 @@ void GrGLLinearGradient::emitCode(GrGLShaderBuilder* builder,

const char* inputColor,

const TextureSamplerArray& samplers) {

this->emitYCoordUniform(builder);

- const char* coords;

+ SkString coords;

this->setupMatrix(builder, key, &coords);

SkString t;

robertphillips 2013/08/28 14:48:44 The ".c_str()" shouldn't be necessary here.

bsalomon 2013/08/28 15:39:59 Done.

- t.append(coords);

+ t.append(coords.c_str());

t.append(".x");

this->emitColorLookup(builder, t.c_str(), outputColor, inputColor, samplers[0]);

}

« src/core/SkXfermode.cpp ('K') | « src/effects/gradients/SkGradientShaderPriv.h ('k') | src/effects/gradients/SkRadialGradient.cpp » ('j') | src/effects/gradients/SkRadialGradient.cpp » ('J')