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

make get_size_info straightforward for zero size

pull/50/head
Daniel Micay 2018-09-11 14:51:36 -04:00
parent 7a404ddbf2
commit 82314f4471
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
malloc.c
View File

@ -83,7 +83,7 @@ struct size_info {
static inline struct size_info get_size_info(size_t size) { static inline struct size_info get_size_info(size_t size) {
if (size == 0) { if (size == 0) {
return (struct size_info){16, 0}; return (struct size_info){0, 0};
} }
if (size <= 128) { if (size <= 128) {
return (struct size_info){(size + 15) & ~15, ((size - 1) >> 4) + 1}; return (struct size_info){(size + 15) & ~15, ((size - 1) >> 4) + 1};
@ -280,7 +280,7 @@ static void set_canary(struct slab_metadata *metadata, void *p, size_t size) {
static inline void *allocate_small(size_t requested_size) { static inline void *allocate_small(size_t requested_size) {
struct size_info info = get_size_info(requested_size); struct size_info info = get_size_info(requested_size);
size_t size = info.size; size_t size = info.size ? info.size : 16;
struct size_class *c = &size_class_metadata[info.class]; struct size_class *c = &size_class_metadata[info.class];
size_t slots = size_class_slots[info.class]; size_t slots = size_class_slots[info.class];
size_t slab_size = get_slab_size(slots, size); size_t slab_size = get_slab_size(slots, size);