mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
Handle NULL input to malloc_usable_size [BZ #28506]
Hoist the NULL check for malloc_usable_size into its entry points in malloc-debug and malloc and assume non-NULL in all callees. This fixes BZ #28506 Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org> Reviewed-by: Florian Weimer <fweimer@redhat.com> Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
This commit is contained in:
@ -1,5 +1,6 @@
|
||||
/* Malloc debug DSO.
|
||||
Copyright (C) 2021 Free Software Foundation, Inc.
|
||||
Copyright The GNU Toolchain Authors.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
@ -399,17 +400,17 @@ strong_alias (__debug_calloc, calloc)
|
||||
size_t
|
||||
malloc_usable_size (void *mem)
|
||||
{
|
||||
if (mem == NULL)
|
||||
return 0;
|
||||
|
||||
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);
|
||||
|
||||
if (mem != NULL)
|
||||
{
|
||||
mchunkptr p = mem2chunk (mem);
|
||||
if (DUMPED_MAIN_ARENA_CHUNK (p))
|
||||
return chunksize (p) - SIZE_SZ;
|
||||
}
|
||||
mchunkptr p = mem2chunk (mem);
|
||||
if (DUMPED_MAIN_ARENA_CHUNK (p))
|
||||
return chunksize (p) - SIZE_SZ;
|
||||
|
||||
return musable (mem);
|
||||
}
|
||||
|
Reference in New Issue
Block a user