diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-08-25 12:20:54 -0700 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-08-25 12:20:54 -0700 |
| commit | 4f9bfdcaca2414c8959986f0a4d73f16cb15e1c4 (patch) | |
| tree | 540bab5498d276cbbfad24c48a7ff989ee8b920a /libc/bionic/malloc_limit.cpp | |
| parent | bfda022dd6fbbcea60e9f52496d90ece514b32da (diff) | |
| parent | f77cc9b224c35fa7d1d71e7c374ef19e47b5f6a5 (diff) | |
Merge RP1A.190822.001
Change-Id: Iaf90835a99d87f6246798efd2cea6fe9f750ea18
Diffstat (limited to 'libc/bionic/malloc_limit.cpp')
| -rw-r--r-- | libc/bionic/malloc_limit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/bionic/malloc_limit.cpp b/libc/bionic/malloc_limit.cpp index b42865bf1..6a67cae95 100644 --- a/libc/bionic/malloc_limit.cpp +++ b/libc/bionic/malloc_limit.cpp @@ -113,7 +113,7 @@ static inline void* IncrementLimit(void* mem) { void* LimitCalloc(size_t n_elements, size_t elem_size) { size_t total; - if (__builtin_add_overflow(n_elements, elem_size, &total) || !CheckLimit(total)) { + if (__builtin_mul_overflow(n_elements, elem_size, &total) || !CheckLimit(total)) { warning_log("malloc_limit: calloc(%zu, %zu) exceeds limit %" PRId64, n_elements, elem_size, gAllocLimit); return nullptr; |