mirror of
https://sourceware.org/git/glibc.git
synced 2025-06-15 06:41:47 +03:00
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.
This commit is contained in:
@ -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)
|
||||
|
||||
|
Reference in New Issue
Block a user