Interpose malloc_usable_size to return the correct mcheck value for
malloc_usable_size.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
# the tests expect specific internal behavior that is changed due to linking to
# libmcheck.a.
tests-exclude-mcheck = tst-mallocstate \
- tst-safe-linking tst-malloc-usable \
+ tst-safe-linking \
tst-malloc-backtrace \
tst-malloc-fork-deadlock \
tst-malloc-stats-cancellation \
tst-malloc-thread-fail \
tst-malloc-usable-tunables \
tst-malloc_info \
- tst-pvalloc-fortify \
- tst-reallocarray \
tst-compathooks-off tst-compathooks-on
tests-mcheck = $(filter-out $(tests-exclude-mcheck), $(tests))
size_t
malloc_usable_size (void *mem)
{
+ if (__is_malloc_debug_enabled (MALLOC_MCHECK_HOOK))
+ return mcheck_usable_size (mem);
if (__is_malloc_debug_enabled (MALLOC_CHECK_HOOK))
return malloc_check_get_size (mem);
pedantic = in_pedantic;
return 0;
}
+
+static int
+mcheck_usable_size (struct hdr *h)
+{
+ return (h - 1)->size;
+}