Consolidate valloc/pvalloc code.

To make malloc code more maintainable we make malloc and pvalloc share
logic with memalign.

1 files changed, 7 insertions, 0 deletions

diff --git a/malloc/hooks.c b/malloc/hooks.c
index 1dbe93f383..89fbd3c948 100644
--- a/malloc/hooks.c
+++ b/malloc/hooks.c
@@ -376,6 +376,13 @@ memalign_check(size_t alignment, size_t bytes, const void *caller)
       return 0;
     }
 
+  /* Make sure alignment is power of 2.  */
+  if (!powerof2(alignment)) {
+    size_t a = MALLOC_ALIGNMENT * 2;
+    while (a < alignment) a <<= 1;
+    alignment = a;
+  }
+
   (void)mutex_lock(&main_arena.mutex);
   mem = (top_check() >= 0) ? _int_memalign(&main_arena, alignment, bytes+1) :
     NULL;