summaryrefslogtreecommitdiffstats
path: root/mozilla-jemalloc-526152.patch
blob: 6ffce7adbc75e6619782c0da87be5635b0224ae5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
--- mozilla-1.9.2/memory/jemalloc/jemalloc.c.orig	2009-12-17 21:56:35.000000000 +0100
+++ mozilla-1.9.2/memory/jemalloc/jemalloc.c	2009-12-17 21:57:32.000000000 +0100
@@ -5822,14 +5822,14 @@
 {
 	void *ret;
 
-	assert(((alignment - 1) & alignment) == 0 && alignment >=
-	    sizeof(void *));
+	assert(((alignment - 1) & alignment) == 0);
 
 	if (malloc_init()) {
 		ret = NULL;
 		goto RETURN;
 	}
 
+	alignment = alignment < sizeof(void*) ? sizeof(void*) : alignment;
 	ret = ipalloc(alignment, size);
 
 RETURN: