diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2021-02-17 10:15:18 +0000 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2021-03-26 11:03:06 +0000 |
| commit | d32624802d0b2105c95f699dd6a887b54cebf197 (patch) | |
| tree | 97b93d1bbc80fad133a307471b661b4ae659b97f /malloc/hooks.c | |
| parent | 63a20eb03c0c363cf5271eb3a2fa0bb7552c01be (diff) | |
| download | glibc-d32624802d0b2105c95f699dd6a887b54cebf197.zip glibc-d32624802d0b2105c95f699dd6a887b54cebf197.tar.gz glibc-d32624802d0b2105c95f699dd6a887b54cebf197.tar.bz2 | |
malloc: Use mtag_enabled instead of USE_MTAG
Use the runtime check where possible: it should not cause slow down in
the !USE_MTAG case since then mtag_enabled is constant false, but it
allows compiling the tagging logic so it's less likely to break or
diverge when developers only test the !USE_MTAG case.
Reviewed-by: DJ Delorie <dj@redhat.com>
Diffstat (limited to 'malloc/hooks.c')
| -rw-r--r-- | malloc/hooks.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/malloc/hooks.c b/malloc/hooks.c index d8e304c..9474e19 100644 --- a/malloc/hooks.c +++ b/malloc/hooks.c @@ -262,11 +262,10 @@ free_check (void *mem, const void *caller) int err = errno; -#ifdef USE_MTAG /* Quickly check that the freed pointer matches the tag for the memory. This gives a useful double-free detection. */ - *(volatile char *)mem; -#endif + if (__glibc_unlikely (mtag_enabled)) + *(volatile char *)mem; __libc_lock_lock (main_arena.mutex); p = mem2chunk_check (mem, NULL); @@ -310,11 +309,10 @@ realloc_check (void *oldmem, size_t bytes, const void *caller) return NULL; } -#ifdef USE_MTAG /* Quickly check that the freed pointer matches the tag for the memory. This gives a useful double-free detection. */ - *(volatile char *)oldmem; -#endif + if (__glibc_unlikely (mtag_enabled)) + *(volatile char *)oldmem; __libc_lock_lock (main_arena.mutex); const mchunkptr oldp = mem2chunk_check (oldmem, &magic_p); |