aboutsummaryrefslogtreecommitdiffstats
path: root/common/almalloc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'common/almalloc.cpp')
-rw-r--r--common/almalloc.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/common/almalloc.cpp b/common/almalloc.cpp
index 35b95001..f7af5bf3 100644
--- a/common/almalloc.cpp
+++ b/common/almalloc.cpp
@@ -3,6 +3,7 @@
#include "almalloc.h"
+#include <cassert>
#include <cstdlib>
#include <cstring>
#ifdef HAVE_MALLOC_H
@@ -26,6 +27,9 @@
void *al_malloc(size_t alignment, size_t size)
{
+ assert((alignment & (alignment-1)) == 0);
+ alignment = std::max(alignment, sizeof(void*));
+
#if defined(HAVE_ALIGNED_ALLOC)
size = (size+(alignment-1))&~(alignment-1);
return aligned_alloc(alignment, size);