diff options
| author | Qihao Chencao <twose@qq.com> | 2022-06-28 16:57:55 +0800 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2023-02-17 17:07:44 -0300 |
| commit | cc4d6614b5922c1104125b1f4d0850a88a551882 (patch) | |
| tree | aade315fd79153cf930e8dfd15581dcbdffea0b8 /elf/dl-minimal-malloc.c | |
| parent | dab63442791e334d592ce91827ffa9d14ca92ea9 (diff) | |
| download | glibc-cc4d6614b5922c1104125b1f4d0850a88a551882.zip glibc-cc4d6614b5922c1104125b1f4d0850a88a551882.tar.gz glibc-cc4d6614b5922c1104125b1f4d0850a88a551882.tar.bz2 | |
Use uintptr_t instead of performing pointer subtraction with a null pointer
Signed-off-by: Qihao Chencao <twose@qq.com>
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf/dl-minimal-malloc.c')
| -rw-r--r-- | elf/dl-minimal-malloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/dl-minimal-malloc.c b/elf/dl-minimal-malloc.c index 2ef8ad3..2754964 100644 --- a/elf/dl-minimal-malloc.c +++ b/elf/dl-minimal-malloc.c @@ -38,13 +38,13 @@ __minimal_malloc (size_t n) /* Consume any unused space in the last page of our data segment. */ extern int _end attribute_hidden; alloc_ptr = &_end; - alloc_end = (void *) 0 + (((alloc_ptr - (void *) 0) + alloc_end = (void *) 0 + ((((uintptr_t) alloc_ptr) + GLRO(dl_pagesize) - 1) & ~(GLRO(dl_pagesize) - 1)); } /* Make sure the allocation pointer is ideally aligned. */ - alloc_ptr = (void *) 0 + (((alloc_ptr - (void *) 0) + MALLOC_ALIGNMENT - 1) + alloc_ptr = (void *) 0 + ((((uintptr_t) alloc_ptr) + MALLOC_ALIGNMENT - 1) & ~(MALLOC_ALIGNMENT - 1)); if (alloc_ptr + n >= alloc_end || n >= -(uintptr_t) alloc_ptr) |