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/malloc-internal.h | |
parent | 09104e5ba47de6691a371d214da48dd8493c39bd (diff) | |
download | glibc-0253580a75decdaf22b6abce60d8265b2adb7dea.tar.gz glibc-0253580a75decdaf22b6abce60d8265b2adb7dea.tar.xz 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/malloc-internal.h')
-rw-r--r-- | malloc/malloc-internal.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/malloc/malloc-internal.h b/malloc/malloc-internal.h index 9cee0fb2d7..70d5b38504 100644 --- a/malloc/malloc-internal.h +++ b/malloc/malloc-internal.h @@ -74,24 +74,4 @@ void __malloc_fork_unlock_child (void) attribute_hidden; /* Called as part of the thread shutdown sequence. */ void __malloc_arena_thread_freeres (void) attribute_hidden; -/* Set *RESULT to LEFT * RIGHT. Return true if the multiplication - overflowed. */ -static inline bool -check_mul_overflow_size_t (size_t left, size_t right, size_t *result) -{ -#if __GNUC__ >= 5 - return __builtin_mul_overflow (left, right, result); -#else - /* size_t is unsigned so the behavior on overflow is defined. */ - *result = left * right; - size_t half_size_t = ((size_t) 1) << (8 * sizeof (size_t) / 2); - if (__glibc_unlikely ((left | right) >= half_size_t)) - { - if (__glibc_unlikely (right != 0 && *result / right != left)) - return true; - } - return false; -#endif -} - #endif /* _MALLOC_INTERNAL_H */ |