Date: Wed, 18 Jun 2014 19:10:22 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1607 - in trunk: mail/thunderbird/files www/firefox-esr/files www/libxul/files Message-ID: <201406181910.s5IJAM9f061083@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Jun 18 19:10:22 2014 New Revision: 1607 Log: backport crashfix for system sqlite/nss Added: trunk/mail/thunderbird/files/patch-bug938730 trunk/www/firefox-esr/files/patch-bug938730 trunk/www/libxul/files/patch-bug938730 Added: trunk/mail/thunderbird/files/patch-bug938730 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug938730 Wed Jun 18 19:10:22 2014 (r1607) @@ -0,0 +1,35 @@ +commit 1961aa2 +Author: Kai Engert <kaie@kuix.de> +Date: Wed Nov 20 20:25:12 2013 +0100 + + Bug 938730 - avoid mix of memory allocators (crashes) when using system sqlite, r=asuth +--- + storage/src/Makefile.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git storage/src/Makefile.in storage/src/Makefile.in +index 9418640..c7391ed 100644 +--- mozilla/storage/src/Makefile.in ++++ mozilla/storage/src/Makefile.in +@@ -6,14 +6,21 @@ + # Don't use the jemalloc allocator on Android, because we can't guarantee + # that Gecko will configure sqlite before it is first used (bug 730495). + # ++# Don't use the jemalloc allocator when using system sqlite. Linked in libraries ++# (such as NSS) might trigger an initialization of sqlite and allocation ++# of memory using the default allocator, prior to the storage service ++# registering its allocator, causing memory management failures (bug 938730). ++# + # Note: On Windows our sqlite build assumes we use jemalloc. If you disable + # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef + # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in. + ifdef MOZ_MEMORY ++ifndef MOZ_NATIVE_SQLITE + ifneq ($(OS_TARGET), Android) + DEFINES += -DMOZ_STORAGE_MEMORY + endif + endif ++endif + + # For nsDependentJSString + LOCAL_INCLUDES = \ Added: trunk/www/firefox-esr/files/patch-bug938730 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug938730 Wed Jun 18 19:10:22 2014 (r1607) @@ -0,0 +1,35 @@ +commit 1961aa2 +Author: Kai Engert <kaie@kuix.de> +Date: Wed Nov 20 20:25:12 2013 +0100 + + Bug 938730 - avoid mix of memory allocators (crashes) when using system sqlite, r=asuth +--- + storage/src/Makefile.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git storage/src/Makefile.in storage/src/Makefile.in +index 9418640..c7391ed 100644 +--- storage/src/Makefile.in ++++ storage/src/Makefile.in +@@ -6,14 +6,21 @@ + # Don't use the jemalloc allocator on Android, because we can't guarantee + # that Gecko will configure sqlite before it is first used (bug 730495). + # ++# Don't use the jemalloc allocator when using system sqlite. Linked in libraries ++# (such as NSS) might trigger an initialization of sqlite and allocation ++# of memory using the default allocator, prior to the storage service ++# registering its allocator, causing memory management failures (bug 938730). ++# + # Note: On Windows our sqlite build assumes we use jemalloc. If you disable + # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef + # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in. + ifdef MOZ_MEMORY ++ifndef MOZ_NATIVE_SQLITE + ifneq ($(OS_TARGET), Android) + DEFINES += -DMOZ_STORAGE_MEMORY + endif + endif ++endif + + # For nsDependentJSString + LOCAL_INCLUDES = \ Added: trunk/www/libxul/files/patch-bug938730 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug938730 Wed Jun 18 19:10:22 2014 (r1607) @@ -0,0 +1,35 @@ +commit 1961aa2 +Author: Kai Engert <kaie@kuix.de> +Date: Wed Nov 20 20:25:12 2013 +0100 + + Bug 938730 - avoid mix of memory allocators (crashes) when using system sqlite, r=asuth +--- + storage/src/Makefile.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git storage/src/Makefile.in storage/src/Makefile.in +index 9418640..c7391ed 100644 +--- storage/src/Makefile.in ++++ storage/src/Makefile.in +@@ -6,14 +6,21 @@ + # Don't use the jemalloc allocator on Android, because we can't guarantee + # that Gecko will configure sqlite before it is first used (bug 730495). + # ++# Don't use the jemalloc allocator when using system sqlite. Linked in libraries ++# (such as NSS) might trigger an initialization of sqlite and allocation ++# of memory using the default allocator, prior to the storage service ++# registering its allocator, causing memory management failures (bug 938730). ++# + # Note: On Windows our sqlite build assumes we use jemalloc. If you disable + # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef + # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in. + ifdef MOZ_MEMORY ++ifndef MOZ_NATIVE_SQLITE + ifneq ($(OS_TARGET), Android) + DEFINES += -DMOZ_STORAGE_MEMORY + endif + endif ++endif + + # For nsDependentJSString + LOCAL_INCLUDES = \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406181910.s5IJAM9f061083>