diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2018-12-21 09:49:37 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2018-12-28 15:39:45 -0200 |
| commit | 0253580a75decdaf22b6abce60d8265b2adb7dea (patch) | |
| tree | 9c2ff33657d7044ad615141eb2279abb166c757d /malloc/reallocarray.c | |
| parent | 09104e5ba47de6691a371d214da48dd8493c39bd (diff) | |
| download | glibc-0253580a75decdaf22b6abce60d8265b2adb7dea.tar glibc-0253580a75decdaf22b6abce60d8265b2adb7dea.tar.gz glibc-0253580a75decdaf22b6abce60d8265b2adb7dea.tar.bz2 glibc-0253580a75decdaf22b6abce60d8265b2adb7dea.zip | |
Replace check_mul_overflow_size_t with __builtin_mul_overflow
Checked on x86_64-linux-gnu and i686-linux-gnu.
* malloc/alloc_buffer_alloc_array.c (__libc_alloc_buffer_alloc_array):
Use __builtin_mul_overflow in place of check_mul_overflow_size_t.
* malloc/dynarray_emplace_enlarge.c (__libc_dynarray_emplace_enlarge):
Likewise.
* malloc/dynarray_resize.c (__libc_dynarray_resize): Likewise.
* malloc/reallocarray.c (__libc_reallocarray): Likewise.
* malloc/malloc-internal.h (check_mul_overflow_size_t): Remove
function.
* support/blob_repeat.c (check_mul_overflow_size_t,
(minimum_stride_size, support_blob_repeat_allocate): Likewise.
Diffstat (limited to 'malloc/reallocarray.c')
| -rw-r--r-- | malloc/reallocarray.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/malloc/reallocarray.c b/malloc/reallocarray.c index 319eccd21f..32642303a3 100644 --- a/malloc/reallocarray.c +++ b/malloc/reallocarray.c @@ -18,19 +18,17 @@ #include <errno.h> #include <malloc.h> -#include <malloc/malloc-internal.h> void * __libc_reallocarray (void *optr, size_t nmemb, size_t elem_size) { size_t bytes; - if (check_mul_overflow_size_t (nmemb, elem_size, &bytes)) + if (__builtin_mul_overflow (nmemb, elem_size, &bytes)) { __set_errno (ENOMEM); return 0; } - else - return realloc (optr, bytes); + return realloc (optr, bytes); } libc_hidden_def (__libc_reallocarray) |