mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 04:50:07 +00:00
0253580a75
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.
64 lines
2.0 KiB
C
64 lines
2.0 KiB
C
/* Increase the size of a dynamic array.
|
|
Copyright (C) 2017-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <dynarray.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
bool
|
|
__libc_dynarray_resize (struct dynarray_header *list, size_t size,
|
|
void *scratch, size_t element_size)
|
|
{
|
|
/* The existing allocation provides sufficient room. */
|
|
if (size <= list->allocated)
|
|
{
|
|
list->used = size;
|
|
return true;
|
|
}
|
|
|
|
/* Otherwise, use size as the new allocation size. The caller is
|
|
expected to provide the final size of the array, so there is no
|
|
over-allocation here. */
|
|
|
|
size_t new_size_bytes;
|
|
if (__builtin_mul_overflow (size, element_size, &new_size_bytes))
|
|
{
|
|
/* Overflow. */
|
|
__set_errno (ENOMEM);
|
|
return false;
|
|
}
|
|
void *new_array;
|
|
if (list->array == scratch)
|
|
{
|
|
/* The previous array was not heap-allocated. */
|
|
new_array = malloc (new_size_bytes);
|
|
if (new_array != NULL && list->array != NULL)
|
|
memcpy (new_array, list->array, list->used * element_size);
|
|
}
|
|
else
|
|
new_array = realloc (list->array, new_size_bytes);
|
|
if (new_array == NULL)
|
|
return false;
|
|
list->array = new_array;
|
|
list->allocated = size;
|
|
list->used = size;
|
|
return true;
|
|
}
|
|
libc_hidden_def (__libc_dynarray_resize)
|