aboutsummaryrefslogtreecommitdiff
path: root/malloc
diff options
context:
space:
mode:
authorSzabolcs Nagy <szabolcs.nagy@arm.com>2022-03-16 12:09:15 +0000
committerSzabolcs Nagy <szabolcs.nagy@arm.com>2022-10-28 11:16:09 +0100
commit68619ddb3b7e8b64a6b849e4972e67163f7659c3 (patch)
tree30368b5713ab1dc9d48f6b04d7e4d9bfe94048f0 /malloc
parent3fa20d59d9607e4494dfbc99bacee1935ec5ded9 (diff)
downloadglibc-68619ddb3b7e8b64a6b849e4972e67163f7659c3.zip
glibc-68619ddb3b7e8b64a6b849e4972e67163f7659c3.tar.gz
glibc-68619ddb3b7e8b64a6b849e4972e67163f7659c3.tar.bz2
malloc: Use uintptr_t in alloc_buffer
The values represnt pointers and not sizes. The members of struct alloc_buffer are already uintptr_t. Reviewed-by: Florian Weimer <fweimer@redhat.com>
Diffstat (limited to 'malloc')
-rw-r--r--malloc/alloc_buffer_alloc_array.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/malloc/alloc_buffer_alloc_array.c b/malloc/alloc_buffer_alloc_array.c
index d8c08d0..b5f32bb 100644
--- a/malloc/alloc_buffer_alloc_array.c
+++ b/malloc/alloc_buffer_alloc_array.c
@@ -23,12 +23,12 @@ void *
__libc_alloc_buffer_alloc_array (struct alloc_buffer *buf, size_t element_size,
size_t align, size_t count)
{
- size_t current = buf->__alloc_buffer_current;
+ uintptr_t current = buf->__alloc_buffer_current;
/* The caller asserts that align is a power of two. */
- size_t aligned = ALIGN_UP (current, align);
+ uintptr_t aligned = ALIGN_UP (current, align);
size_t size;
bool overflow = __builtin_mul_overflow (element_size, count, &size);
- size_t new_current = aligned + size;
+ uintptr_t new_current = aligned + size;
if (!overflow /* Multiplication did not overflow. */
&& aligned >= current /* No overflow in align step. */
&& new_current >= size /* No overflow in size computation. */