From 38a23ef90eab3e798260999d546e4b62beb30838 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 May 2010 16:22:15 +0200 Subject: Firefox 3.6.4build3 --- mozilla-jemalloc-526152.patch | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'mozilla-jemalloc-526152.patch') diff --git a/mozilla-jemalloc-526152.patch b/mozilla-jemalloc-526152.patch index 6ffce7a..5f60485 100644 --- a/mozilla-jemalloc-526152.patch +++ b/mozilla-jemalloc-526152.patch @@ -1,6 +1,14 @@ ---- 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 @@ +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; @@ -17,3 +25,8 @@ 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