summaryrefslogtreecommitdiffstats
path: root/mozilla-jemalloc-526152.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2010-05-13 14:29:48 +0200
committerRemi Collet <fedora@famillecollet.com>2010-05-13 14:29:48 +0200
commit139f64c6307428ff5ccc8a6e3fd5fa607f2f95ef (patch)
treec9bc8c8ce31f5a864220fc11802db926eb207c0a /mozilla-jemalloc-526152.patch
import Firefox, 3.6.3plugin1
Diffstat (limited to 'mozilla-jemalloc-526152.patch')
-rw-r--r--mozilla-jemalloc-526152.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/mozilla-jemalloc-526152.patch b/mozilla-jemalloc-526152.patch
new file mode 100644
index 0000000..6ffce7a
--- /dev/null
+++ b/mozilla-jemalloc-526152.patch
@@ -0,0 +1,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: