diff options
author | Mike Reed <reed@google.com> | 2018-01-05 11:20:10 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-05 21:29:35 +0000 |
commit | 8dc8dbc8211e7b0245a6e7db911265efbe0fccaf (patch) | |
tree | f112c74f618a536e86a80d9d657b804a039f3f54 /src/core/SkAutoMalloc.h | |
parent | f21b32ccd7bd174ce647078854b2314f8b64d94c (diff) |
begin cleanup of malloc porting layer
1. Merge some of the allocators into sk_malloc_flags by redefining a flag to mean zero-init
2. Add more private helpers to simplify our call-sites (and handle some overflow mul checks)
3. The 2-param helpers rely on the saturating SkSafeMath::Mul to pass max_size_t as the request,
which should always fail.
Bug:508641
Change-Id: I322f1e6ed91113467e0fdb12c91c3dad33d890c8
Reviewed-on: https://skia-review.googlesource.com/90940
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Stephan Altmueller <stephana@google.com>
Diffstat (limited to 'src/core/SkAutoMalloc.h')
-rw-r--r-- | src/core/SkAutoMalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkAutoMalloc.h b/src/core/SkAutoMalloc.h index 03cbf79ea6..f5c872954d 100644 --- a/src/core/SkAutoMalloc.h +++ b/src/core/SkAutoMalloc.h @@ -144,7 +144,7 @@ public: SkASSERT(fPtr != fStorage); // otherwise we lied when setting didChangeAlloc. fPtr = fStorage; } else { - fPtr = sk_malloc_flags(size, SK_MALLOC_THROW | SK_MALLOC_TEMP); + fPtr = sk_malloc_throw(size); } fSize = size; |