From 1128ebcb6dde49b639b5ba9917c14bb8b7a9eaae Mon Sep 17 00:00:00 2001
From: Mike Reed <reed@google.com>
Date: Fri, 13 Jul 2018 16:13:08 -0400
Subject: 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>
---
 include/private/SkArenaAlloc.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include')

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;
     }
 
-- 
cgit v1.2.3