From 8b42e8c3d68e3d1e08dc3709145960c6e536bf48 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Tue, 28 Aug 2018 22:46:20 -0400
Subject: [PATCH] make sure errno is always set on failure

---
 malloc.c | 12 ++++++++----
 util.h   |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/malloc.c b/malloc.c
index def5225..01da517 100644
--- a/malloc.c
+++ b/malloc.c
@@ -59,7 +59,8 @@ static void *allocate_pages(size_t usable_size, size_t guard_size, bool unprotec
     usable_size = PAGE_CEILING(usable_size);
 
     size_t real_size;
-    if (__builtin_add_overflow(usable_size, guard_size * 2, &real_size)) {
+    if (unlikely(__builtin_add_overflow(usable_size, guard_size * 2, &real_size))) {
+        errno = ENOMEM;
         return NULL;
     }
     void *real = memory_map(real_size);
@@ -84,12 +85,14 @@ static void *allocate_pages_aligned(size_t usable_size, size_t alignment, size_t
     usable_size = PAGE_CEILING(usable_size);
 
     size_t alloc_size;
-    if (__builtin_add_overflow(usable_size, alignment - PAGE_SIZE, &alloc_size)) {
+    if (unlikely(__builtin_add_overflow(usable_size, alignment - PAGE_SIZE, &alloc_size))) {
+        errno = ENOMEM;
         return NULL;
     }
 
     size_t real_alloc_size;
-    if (__builtin_add_overflow(alloc_size, guard_size * 2, &real_alloc_size)) {
+    if (unlikely(__builtin_add_overflow(alloc_size, guard_size * 2, &real_alloc_size))) {
+        errno = ENOMEM;
         return NULL;
     }
 
@@ -219,6 +222,7 @@ static struct slab_metadata *alloc_metadata(struct size_class *c, size_t slab_si
     if (unlikely(c->metadata_count == c->metadata_allocated)) {
         size_t metadata_max = get_metadata_max(slab_size);
         if (c->metadata_count == metadata_max) {
+            errno = ENOMEM;
             return NULL;
         }
         size_t allocate = c->metadata_allocated * 2;
@@ -741,7 +745,7 @@ EXPORT void *h_malloc(size_t size) {
 
 EXPORT void *h_calloc(size_t nmemb, size_t size) {
     size_t total_size;
-    if (__builtin_mul_overflow(nmemb, size, &total_size)) {
+    if (unlikely(__builtin_mul_overflow(nmemb, size, &total_size))) {
         errno = ENOMEM;
         return NULL;
     }
diff --git a/util.h b/util.h
index 1a90e13..7917819 100644
--- a/util.h
+++ b/util.h
@@ -3,8 +3,8 @@
 
 #include <stdnoreturn.h>
 
-#define likely(x) __builtin_expect((x), 1)
-#define unlikely(x) __builtin_expect((x), 0)
+#define likely(x) __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
 
 #define COLD __attribute__((cold))
 #define UNUSED __attribute__((unused))