about summary refs log tree commit diff
path: root/malloc/dynarray_emplace_enlarge.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2018-12-21 09:49:37 -0200
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2018-12-28 15:39:45 -0200
commit0253580a75decdaf22b6abce60d8265b2adb7dea (patch)
tree9c2ff33657d7044ad615141eb2279abb166c757d /malloc/dynarray_emplace_enlarge.c
parent09104e5ba47de6691a371d214da48dd8493c39bd (diff)
downloadglibc-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/dynarray_emplace_enlarge.c')
-rw-r--r--malloc/dynarray_emplace_enlarge.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/malloc/dynarray_emplace_enlarge.c b/malloc/dynarray_emplace_enlarge.c
index 0408271e27..aa8f5fae3f 100644
--- a/malloc/dynarray_emplace_enlarge.c
+++ b/malloc/dynarray_emplace_enlarge.c
@@ -18,7 +18,6 @@
 
 #include <dynarray.h>
 #include <errno.h>
-#include <malloc-internal.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -52,7 +51,7 @@ __libc_dynarray_emplace_enlarge (struct dynarray_header *list,
     }
 
   size_t new_size;
-  if (check_mul_overflow_size_t (new_allocated, element_size, &new_size))
+  if (__builtin_mul_overflow (new_allocated, element_size, &new_size))
     return false;
   void *new_array;
   if (list->array == scratch)