AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve sanity checks on gradient constructor parameters

Browse Source 
BUG=445807

Review URL: https://codereview.chromium.org/837013002
This commit is contained in:
reed 2015-01-06 07:13:19 -08:00 committed by Commit bot
parent e0d5a27970
commit 1b74730c6b
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/effects/gradients/SkGradientShader.cpp
View File

@ -735,6 +735,12 @@ void SkGradientShaderBase::toString(SkString* str) const {
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// Return true if these parameters are valid/legal/safe to construct a gradient
//
static bool valid_grad(const SkColor colors[], const SkScalar pos[], int count, unsigned tileMode) {
return NULL != colors && count >= 1 && tileMode < (unsigned)SkShader::kTileModeCount;
}
// assumes colors is SkColor* and pos is SkScalar*
#define EXPAND_1_COLOR(count) \
SkColor tmp[2]; \
@ -764,7 +770,10 @@ SkShader* SkGradientShader::CreateLinear(const SkPoint pts[2],
SkShader::TileMode mode,
uint32_t flags,
const SkMatrix* localMatrix) {
if (NULL == pts || NULL == colors || colorCount < 1) {
if (!pts) {
return NULL;
}
if (!valid_grad(colors, pos, colorCount, mode)) {
return NULL;
}
EXPAND_1_COLOR(colorCount);
@ -780,7 +789,10 @@ SkShader* SkGradientShader::CreateRadial(const SkPoint& center, SkScalar radius,
SkShader::TileMode mode,
uint32_t flags,
const SkMatrix* localMatrix) {
if (radius <= 0 || NULL == colors || colorCount < 1) {
if (radius <= 0) {
return NULL;
}
if (!valid_grad(colors, pos, colorCount, mode)) {
return NULL;
}
EXPAND_1_COLOR(colorCount);
@ -800,7 +812,10 @@ SkShader* SkGradientShader::CreateTwoPointRadial(const SkPoint& start,
SkShader::TileMode mode,
uint32_t flags,
const SkMatrix* localMatrix) {
if (startRadius < 0 || endRadius < 0 || NULL == colors || colorCount < 1) {
if (startRadius < 0 || endRadius < 0) {
return NULL;
}
if (!valid_grad(colors, pos, colorCount, mode)) {
return NULL;
}
EXPAND_1_COLOR(colorCount);
@ -821,7 +836,10 @@ SkShader* SkGradientShader::CreateTwoPointConical(const SkPoint& start,
SkShader::TileMode mode,
uint32_t flags,
const SkMatrix* localMatrix) {
if (startRadius < 0 || endRadius < 0 || NULL == colors || colorCount < 1) {
if (startRadius < 0 || endRadius < 0) {
return NULL;
}
if (!valid_grad(colors, pos, colorCount, mode)) {
return NULL;
}
if (start == end && startRadius == endRadius) {
@ -865,7 +883,7 @@ SkShader* SkGradientShader::CreateSweep(SkScalar cx, SkScalar cy,
int colorCount,
uint32_t flags,
const SkMatrix* localMatrix) {
if (NULL == colors || colorCount < 1) {
if (!valid_grad(colors, pos, colorCount, SkShader::kClamp_TileMode)) {
return NULL;
}
EXPAND_1_COLOR(colorCount);