rpms/xulrunner/devel mozilla-jemalloc-526152.patch, NONE, 1.1 xulrunner.spec, 1.186, 1.187

[Martin Stransky]

Author: stransky

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

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

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: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- xulrunner.spec	3 Dec 2009 09:22:40 -0000	1.186
+++ xulrunner.spec	17 Dec 2009 08:47:08 -0000	1.187
@@ -17,7 +17,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.2.1
-Release:        0.6.%{?pretag}%{?dist}
+Release:        0.7.%{?pretag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -33,6 +33,7 @@ Patch0:         xulrunner-version.patch
 Patch1:         mozilla-build.patch
 Patch3:         mozilla-jemalloc.patch
 Patch4:         mozilla-about-firefox-version.patch
+Patch5:         mozilla-jemalloc-526152.patch
 Patch7:         xulrunner-1.9.2.1-build.patch
 Patch8:         mozilla-plugin.patch
 
@@ -128,6 +129,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 %patch1  -p1 -b .build
 %patch3  -p1 -b .jemalloc
 %patch4  -p1 -b .about-firefox-version
+%patch5  -p1 -b .jemalloc-526152
 %patch7  -p2 -b .del
 %patch8  -p1 -b .plugin
 
@@ -404,6 +406,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Dec 17 2009 Martin Stransky <stransky at redhat.com> 1.9.2.1-0.7.b4
+- Added fix for mozbz#543585 - jemalloc alignment assertion 
+  and abort on Linux
+
 * Thu Dec 3 2009 Martin Stransky <stransky at redhat.com> 1.9.2.1-0.6.b4
 - Added fix for #543585 - mozilla-plugin.pc contains incorrect CFLAGS