| Index: src/core/SkRegion_path.cpp
|
| diff --git a/src/core/SkRegion_path.cpp b/src/core/SkRegion_path.cpp
|
| index 95247f403e8db29f81e93398c10e8c1b617758c6..a20647c9663da3f6f53e3d99cd3217a4d8e6d7c9 100644
|
| --- a/src/core/SkRegion_path.cpp
|
| +++ b/src/core/SkRegion_path.cpp
|
| @@ -107,6 +107,8 @@
|
| return false;
|
| }
|
|
|
| + Sk64 count, size;
|
| +
|
| if (pathIsInverse) {
|
| // allow for additional X transitions to "invert" each scanline
|
| // [ L' ... normal transitions ... R' ]
|
| @@ -115,25 +117,25 @@
|
| }
|
|
|
| // compute the count with +1 and +3 slop for the working buffer
|
| - int64_t count = sk_64_mul(maxHeight + 1, 3 + maxTransitions);
|
| + count.setMul(maxHeight + 1, 3 + maxTransitions);
|
|
|
| if (pathIsInverse) {
|
| // allow for two "empty" rows for the top and bottom
|
| // [ Y, 1, L, R, S] == 5 (*2 for top and bottom)
|
| - count += 10;
|
| - }
|
| -
|
| - if (count < 0 || !sk_64_isS32(count)) {
|
| + count.add(10);
|
| + }
|
| +
|
| + if (!count.is32() || count.isNeg()) {
|
| return false;
|
| }
|
| - fStorageCount = sk_64_asS32(count);
|
| -
|
| - int64_t size = sk_64_mul(fStorageCount, sizeof(SkRegion::RunType));
|
| - if (size < 0 || !sk_64_isS32(size)) {
|
| + fStorageCount = count.get32();
|
| +
|
| + size.setMul(fStorageCount, sizeof(SkRegion::RunType));
|
| + if (!size.is32() || size.isNeg()) {
|
| return false;
|
| }
|
|
|
| - fStorage = (SkRegion::RunType*)sk_malloc_flags(sk_64_asS32(size), 0);
|
| + fStorage = (SkRegion::RunType*)sk_malloc_flags(size.get32(), 0);
|
| if (NULL == fStorage) {
|
| return false;
|
| }
|
|
|