summaryrefslogtreecommitdiff
path: root/mozilla-jemalloc-526152.patch
diff options
context:
space:
mode:
Diffstat (limited to 'mozilla-jemalloc-526152.patch')
-rw-r--r--mozilla-jemalloc-526152.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/mozilla-jemalloc-526152.patch b/mozilla-jemalloc-526152.patch
new file mode 100644
index 0000000..5f60485
--- /dev/null
+++ b/mozilla-jemalloc-526152.patch
@@ -0,0 +1,32 @@
+From: David Mandelin <dmandelin@mozilla.com>
+
+diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
+--- a/memory/jemalloc/jemalloc.c
++++ b/memory/jemalloc/jemalloc.c
+@@ -5792,24 +5792,24 @@ __attribute__((noinline))
+ #else
+ inline
+ #endif
+ void *
+ memalign(size_t alignment, size_t size)
+ {
+ 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:
+ #ifdef MALLOC_XMALLOC
+ if (opt_xmalloc && ret == NULL) {
+ _malloc_message(_getprogname(),
+ ": (malloc) Error in memalign(): out of memory\n", "", "");
+ abort();
bgstack15