jmb
/
hardened_malloc
mirror of https://github.com/GrapheneOS/hardened_malloc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add is_init check to mallinfo functions

pull/87/head
Daniel Micay 2019-04-14 19:12:38 -04:00
parent 8774065b13
commit 1c899657c1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
h_malloc.c
View File

@ -1698,6 +1698,10 @@ EXPORT struct mallinfo h_mallinfo(void) {
// glibc mallinfo type definition and implementation are both broken // glibc mallinfo type definition and implementation are both broken
#if CONFIG_STATS && !defined(__GLIBC__) #if CONFIG_STATS && !defined(__GLIBC__)
if (!is_init()) {
return info;
}
struct region_allocator *ra = ro.region_allocator; struct region_allocator *ra = ro.region_allocator;
mutex_lock(&ra->lock); mutex_lock(&ra->lock);
info.hblkhd += ra->allocated; info.hblkhd += ra->allocated;
@ -1791,6 +1795,10 @@ EXPORT struct mallinfo __mallinfo_bin_info(UNUSED size_t arena, UNUSED size_t bi
struct mallinfo info = {0}; struct mallinfo info = {0};
#if CONFIG_STATS #if CONFIG_STATS
if (!is_init()) {
return info;
}
if (arena < N_ARENA && bin < N_SIZE_CLASSES) { if (arena < N_ARENA && bin < N_SIZE_CLASSES) {
struct size_class *c = &ro.size_class_metadata[arena][bin]; struct size_class *c = &ro.size_class_metadata[arena][bin];