diff options
| author |  Mike Reed <reed@google.com> | 2018-07-13 16:13:08 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-13 21:00:14 +0000 |
| commit | 1128ebcb6dde49b639b5ba9917c14bb8b7a9eaae (patch) | |
| tree | a4b38866b393ac89c69efc9a7e93065292521186 /include | |
| parent | a80a012456a95a6996a8901268ec34ed0cc3aecb (diff) | |
make u32 check runtime
Bug: 848521
Change-Id: Id3deb30447cc5caa27203b46b6b257e76cd88679
Reviewed-on: https://skia-review.googlesource.com/140986
Reviewed-by: Herb Derby <herb@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/SkArenaAlloc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/private/SkArenaAlloc.h b/include/private/SkArenaAlloc.h index 1f46b12cb9..1915f8f9be 100644 --- a/include/private/SkArenaAlloc.h +++ b/include/private/SkArenaAlloc.h @@ -134,7 +134,9 @@ public: private: static void AssertRelease(bool cond) { if (!cond) { ::abort(); } } static uint32_t ToU32(size_t v) { - assert(v <= 0xffffffff); +#if SIZE_MAX > 0xffffffff + AssertRelease(v <= 0xffffffff); +#endif return (uint32_t)v; } |