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

Handle NULL input to malloc_usable_size [BZ #28506]

Browse Source 
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:
Siddhesh Poyarekar
2021-10-29 14:53:55 +05:30
parent 1d56fd3bae
commit 88e316b064
3 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
malloc/malloc.c
View File

@ -1,5 +1,6 @@
/* Malloc implementation for multiple threads without lock contention.
Copyright (C) 1996-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
@ -5007,20 +5008,13 @@ __malloc_trim (size_t s)
static size_t
musable (void *mem)
{
mchunkptr p;
if (mem != 0)
{
size_t result = 0;
mchunkptr p = mem2chunk (mem);
p = mem2chunk (mem);
if (chunk_is_mmapped (p))
return chunksize (p) - CHUNK_HDR_SZ;
else if (inuse (p))
return memsize (p);
if (chunk_is_mmapped (p))
result = chunksize (p) - CHUNK_HDR_SZ;
else if (inuse (p))
result = memsize (p);
return result;
}
return 0;
}
@ -5028,10 +5022,9 @@ musable (void *mem)
size_t
__malloc_usable_size (void *m)
{
size_t result;
result = musable (m);
return result;
if (m == NULL)
return 0;
return musable (m);
}
#endif