aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Adrienne Walker <enne@chromium.org>2017-08-23 13:26:32 -0700
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-08-23 21:47:27 +0000
commitba9741d46718c44d6e95e990c476d865c1cf4e55 (patch)
treecd76046371521ecf2dfd531a915343ad24fcd023 /src
parent75109accaf8a8ca45fe26b5effdd5fe0641bd8ff (diff)
Validate rrect type in SkRRect::isValid
Bug: chromium: 758161 Change-Id: I2472ff59af2fab05d94d88d5effb44828e8a5132 Reviewed-on: https://skia-review.googlesource.com/37800 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/SkRRect.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/SkRRect.cpp b/src/core/SkRRect.cpp
index 8d69f4afc6..730868a440 100644
--- a/src/core/SkRRect.cpp
+++ b/src/core/SkRRect.cpp
@@ -524,6 +524,10 @@ bool SkRRect::isValid() const {
}
bool patchesOfNine = radii_are_nine_patch(fRadii);
+ if (fType > kLastType) {
+ return false;
+ }
+
switch (fType) {
case kEmpty_Type:
if (!fRect.isEmpty() || !allRadiiZero || !allRadiiSame || !allCornersSquare) {