commit 323431bc274046ca77c020019916009c22e0cd00
author Marco Nelissen <marcone@google.com> Thu Jun 13 12:24:40 2019 -0700
committer Marco Nelissen <marcone@google.com> Tue Jun 18 10:15:28 2019 -0700
tree 486ed76d2ac2ef625e6fd872e2752816872594f1
parent 5c0d6677ee2015620fbe8f24f0f016c7c13b5cc7

Fix overflow check in malloc_limit

Bug: 135201859

Change-Id: I78dcc497cb100ab1d5f4144e2774437891719ca3

libc/bionic/malloc_limit.cpp

diff --git a/libc/bionic/malloc_limit.cpp b/libc/bionic/malloc_limit.cpp
index b42865b..6a67cae 100644
--- a/libc/bionic/malloc_limit.cpp
+++ b/libc/bionic/malloc_limit.cpp
@@ -113,7 +113,7 @@
 
 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;