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>2021-01-11 12:03:38 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2021-02-09 16:57:54 -0300
commitde0e1b45b0aba18ce50de40e42028af2c50e335c (patch)
treef664f8441cd9d2a9eb696265951ca3d01e7a5bd3 /malloc/dynarray_emplace_enlarge.c
parentc8ba52ab3350c334d6e34b1439a4c0c1431351f3 (diff)
downloadglibc-de0e1b45b0aba18ce50de40e42028af2c50e335c.tar.gz
glibc-de0e1b45b0aba18ce50de40e42028af2c50e335c.tar.xz
glibc-de0e1b45b0aba18ce50de40e42028af2c50e335c.zip
malloc: Sync dynarray with gnulib
It syncs with gnulib version a8bac4d49.  The main changes are:

  - Remove the usage of anonymous union within DYNARRAY_STRUCT.
  - Use DYNARRAY_FREE instead of DYNARRAY_NAME (free) so that
    Gnulib does not change 'free' to 'rpl_free'.
  - Use __nonnull instead of __attribute__ ((nonnull ())).
  - Use __attribute_maybe_unused__ instead of
    __attribute__ ((unused, nonnull (1))).
  - Use of _Noreturn instead of _attribute__ ((noreturn)).

The only difference with gnulib is:

--- glibc
+++ gnulib
@@ -18,6 +18,7 @@

 #include <dynarray.h>
 #include <stdio.h>
+#include <stdlib.h>

 void
 __libc_dynarray_at_failure (size_t size, size_t index)
@@ -27,7 +28,6 @@
   __snprintf (buf, sizeof (buf), "Fatal glibc error: "
               "array index %zu not less than array length %zu\n",
               index, size);
- __libc_fatal (buf);
 #else
  abort ();
 #endif

It seems a wrong sync from gnulib (the code is used on loader and
thus it requires __libc_fatal instead of abort).

Checked on x86_64-linux-gnu.
Diffstat (limited to 'malloc/dynarray_emplace_enlarge.c')
-rw-r--r--malloc/dynarray_emplace_enlarge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/malloc/dynarray_emplace_enlarge.c b/malloc/dynarray_emplace_enlarge.c
index f98b0328df..ddfe306fcd 100644
--- a/malloc/dynarray_emplace_enlarge.c
+++ b/malloc/dynarray_emplace_enlarge.c
@@ -18,6 +18,7 @@
 
 #include <dynarray.h>
 #include <errno.h>
+#include <intprops.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -51,7 +52,7 @@ __libc_dynarray_emplace_enlarge (struct dynarray_header *list,
     }
 
   size_t new_size;
-  if (__builtin_mul_overflow (new_allocated, element_size, &new_size))
+  if (INT_MULTIPLY_WRAPV (new_allocated, element_size, &new_size))
     return false;
   void *new_array;
   if (list->array == scratch)