diff options
Diffstat (limited to 'www/libxul/files/patch-bug938730')
| -rw-r--r-- | www/libxul/files/patch-bug938730 | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/www/libxul/files/patch-bug938730 b/www/libxul/files/patch-bug938730 deleted file mode 100644 index ac444b228ae6..000000000000 --- a/www/libxul/files/patch-bug938730 +++ /dev/null @@ -1,35 +0,0 @@ -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 = \ |