lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

malloc: Use uintptr_t in alloc_buffer

Browse Source 
The values represnt pointers and not sizes. The members of struct
alloc_buffer are already uintptr_t.

Reviewed-by: Florian Weimer <fweimer@redhat.com>
This commit is contained in:
Szabolcs Nagy
2022-03-16 12:09:15 +00:00
parent 3fa20d59d9
commit 68619ddb3b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/alloc_buffer.h
View File

@ -248,9 +248,9 @@ __alloc_buffer_alloc (struct alloc_buffer *buf, size_t size, size_t align)
if (size == 1 && align == 1) if (size == 1 && align == 1)
return alloc_buffer_alloc_bytes (buf, size); return alloc_buffer_alloc_bytes (buf, size);
size_t current = buf->__alloc_buffer_current; uintptr_t current = buf->__alloc_buffer_current;
size_t aligned = roundup (current, align); uintptr_t aligned = roundup (current, align);
size_t new_current = aligned + size; uintptr_t new_current = aligned + size;
if (aligned >= current /* No overflow in align step. */ if (aligned >= current /* No overflow in align step. */
&& new_current >= size /* No overflow in size computation. */ && new_current >= size /* No overflow in size computation. */
&& new_current <= buf->__alloc_buffer_end) /* Room in buffer. */ && new_current <= buf->__alloc_buffer_end) /* Room in buffer. */
@ -282,8 +282,8 @@ __alloc_buffer_next (struct alloc_buffer *buf, size_t align)
if (align == 1) if (align == 1)
return (const void *) buf->__alloc_buffer_current; return (const void *) buf->__alloc_buffer_current;
size_t current = buf->__alloc_buffer_current; uintptr_t current = buf->__alloc_buffer_current;
size_t aligned = roundup (current, align); uintptr_t aligned = roundup (current, align);
if (aligned >= current /* No overflow in align step. */ if (aligned >= current /* No overflow in align step. */
&& aligned <= buf->__alloc_buffer_end) /* Room in buffer. */ && aligned <= buf->__alloc_buffer_end) /* Room in buffer. */
{ {

6
malloc/alloc_buffer_alloc_array.c
View File

@ -23,12 +23,12 @@ void *
__libc_alloc_buffer_alloc_array (struct alloc_buffer *buf, size_t element_size, __libc_alloc_buffer_alloc_array (struct alloc_buffer *buf, size_t element_size,
size_t align, size_t count) 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. */ /* 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; size_t size;
bool overflow = __builtin_mul_overflow (element_size, count, &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. */ if (!overflow /* Multiplication did not overflow. */
&& aligned >= current /* No overflow in align step. */ && aligned >= current /* No overflow in align step. */
&& new_current >= size /* No overflow in size computation. */ && new_current >= size /* No overflow in size computation. */