From 38b02c818ba97c8016d63c9e12a5497c3afeac20 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@fedoraproject.org>
Date: Dec 17 2009 09:42:00 +0000
Subject: Added fix for mozbz#526152 - jemalloc fix


---

diff --git a/firefox.spec b/firefox.spec
index f94ea69..e806ab7 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -20,7 +20,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.6.1
-Release:        0.5.%{?prever}%{?dist}
+Release:        0.6.%{?prever}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -40,6 +40,7 @@ Source100:      find-external-requires
 
 #Build patches
 Patch0:         firefox-version.patch
+Patch1:         mozilla-jemalloc-526152.patch
 
 # Upstream patches
 
@@ -85,6 +86,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{internal_version}/' %{P:%%PATCH0} \
     
 
 # For branding specific patches.
+%patch1 -p1 -b .526152
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -344,6 +346,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Nov 27 2009 Martin Stransky <stransky@redhat.com> - 3.6.1-0.6.b4
+- Added fix for mozbz#526152 - jemalloc fix
+
 * Wed Nov 27 2009 Martin Stransky <stransky@redhat.com> - 3.6.1-0.5.b4
 - Update to 3.6.1 Beta 4
 
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();