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

Disallow negative radii in deserialized SkRRects

Browse Source 
bug= chromium:787124

Change-Id: I232ccd6bdfc2c176f97b97e24eabad6a9ce8e5e2
Reviewed-on: https://skia-review.googlesource.com/73901
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Brian Salomon 2017-11-20 21:56:29 -05:00 committed by Skia Commit-Bot
parent f8fa50f099
commit 4b0e364f92
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/SkRRect.cpp
View File

@ -530,7 +530,8 @@ void SkRRect::dump(bool asHex) const {
* We need all combinations of predicates to be true to have a "safe" radius value.
*/
static bool are_radius_check_predicates_valid(SkScalar rad, SkScalar min, SkScalar max) {
return (min <= max) && (rad <= max - min) && (min + rad <= max) && (max - rad >= min);
return (min <= max) && (rad <= max - min) && (min + rad <= max) && (max - rad >= min) &&
rad >= 0;
}
bool SkRRect::isValid() const {

2
tests/RoundRectTest.cpp
View File

@ -786,6 +786,8 @@ static void test_read(skiatest::Reporter* reporter) {
test_read_rrect(reporter, rrect, false);
*innerRadius = SK_ScalarNaN;
test_read_rrect(reporter, rrect, false);
*innerRadius = -10.f;
test_read_rrect(reporter, rrect, false);
}
DEF_TEST(RoundRect, reporter) {