rpms/firefox/devel mozilla-jemalloc-526152.patch, NONE, 1.1 firefox.spec, 1.348, 1.349

[Martin Stransky]

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12073

Modified Files:
	firefox.spec 
Added Files:
	mozilla-jemalloc-526152.patch 
Log Message:
Added fix for mozbz#526152 - jemalloc fix

mozilla-jemalloc-526152.patch:
 jemalloc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE mozilla-jemalloc-526152.patch ---
From: David Mandelin <dmandelin at 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();


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -p -r1.348 -r1.349
--- firefox.spec	27 Nov 2009 11:02:06 -0000	1.348
+++ firefox.spec	17 Dec 2009 09:42:00 -0000	1.349
@@ -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__/%{int
     
 
 # 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/
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Nov 27 2009 Martin Stransky <stransky at redhat.com> - 3.6.1-0.6.b4
+- Added fix for mozbz#526152 - jemalloc fix
+
 * Wed Nov 27 2009 Martin Stransky <stransky at redhat.com> - 3.6.1-0.5.b4
 - Update to 3.6.1 Beta 4