diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-01-16 03:52:05 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-01-16 09:14:08 -0500 |
| commit | 2a666e9cfddc5ec25831618bc376ab4ca6692527 (patch) | |
| tree | ea21d6d2100179e96b5948a2e3361d838ba0b148 /gnu/packages/patches/icecat-CVE-2014-8634-pt2.patch | |
| parent | 57b7e1a62d2269bfd9d37f88bae92c829222f8fc (diff) | |
gnu: icecat: Add fixes for CVE-2014-{8634,8638,8639,8641}.
* gnu/packages/patches/icecat-CVE-2014-8634-pt1.patch,
gnu/packages/patches/icecat-CVE-2014-8634-pt2.patch,
gnu/packages/patches/icecat-CVE-2014-8638-pt1.patch,
gnu/packages/patches/icecat-CVE-2014-8638-pt2.patch,
gnu/packages/patches/icecat-CVE-2014-8639.patch,
gnu/packages/patches/icecat-CVE-2014-8641.patch,
gnu/packages/patches/icecat-armhf-xpcom.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/gnuzilla.scm (icecat)[source]: Add patches.
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2014-8634-pt2.patch')
| -rw-r--r-- | gnu/packages/patches/icecat-CVE-2014-8634-pt2.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2014-8634-pt2.patch b/gnu/packages/patches/icecat-CVE-2014-8634-pt2.patch new file mode 100644 index 0000000000..d7f68e9df3 --- /dev/null +++ b/gnu/packages/patches/icecat-CVE-2014-8634-pt2.patch @@ -0,0 +1,30 @@ +From e5de31c8f927b1aa06dde02c356cda33beb463d9 Mon Sep 17 00:00:00 2001 +From: Kyle Huey <khuey@kylehuey.com> +Date: Fri, 19 Dec 2014 18:16:17 -0800 +Subject: [PATCH] Bug 1111737. r=smaug, a=bkerensa + +--- + content/base/src/nsScriptLoader.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/content/base/src/nsScriptLoader.cpp b/content/base/src/nsScriptLoader.cpp +index a6a4c34..7f3a76e 100644 +--- a/content/base/src/nsScriptLoader.cpp ++++ b/content/base/src/nsScriptLoader.cpp +@@ -812,7 +812,12 @@ NotifyOffThreadScriptLoadCompletedRunnable::Run() + { + MOZ_ASSERT(NS_IsMainThread()); + +- nsresult rv = mLoader->ProcessOffThreadRequest(mRequest, &mToken); ++ // We want these to be dropped on the main thread, once we return from this ++ // function. ++ nsRefPtr<nsScriptLoadRequest> request = mRequest.forget(); ++ nsRefPtr<nsScriptLoader> loader = mLoader.forget(); ++ ++ nsresult rv = loader->ProcessOffThreadRequest(request, &mToken); + + if (mToken) { + // The result of the off thread parse was not actually needed to process +-- +2.1.2 + |