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

eliminate unnecessary code duplication in calloc

pull/69/head
Daniel Micay 2018-11-16 14:58:55 -05:00
parent 315415acf2
commit 58c7079db9
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
malloc.c
View File

@ -1081,17 +1081,9 @@ EXPORT void *h_calloc(size_t nmemb, size_t size) {
init(); init();
thread_unseal_metadata(); thread_unseal_metadata();
total_size = adjust_size_for_canaries(total_size); total_size = adjust_size_for_canaries(total_size);
if (ZERO_ON_FREE) {
void *p = allocate(total_size); void *p = allocate(total_size);
thread_seal_metadata(); thread_seal_metadata();
return p; if (!ZERO_ON_FREE && likely(p != NULL) && size && size <= max_slab_size_class) {
}
void *p = allocate(total_size);
thread_seal_metadata();
if (unlikely(p == NULL)) {
return NULL;
}
if (size && size <= max_slab_size_class) {
memset(p, 0, total_size - canary_size); memset(p, 0, total_size - canary_size);
} }
return p; return p;