From 38b02c818ba97c8016d63c9e12a5497c3afeac20 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 17 Dec 2009 09:42:00 +0000 Subject: Added fix for mozbz#526152 - jemalloc fix --- mozilla-jemalloc-526152.patch | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 mozilla-jemalloc-526152.patch (limited to 'mozilla-jemalloc-526152.patch') 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 + +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(); -- cgit