aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2017-12-01 13:08:27 +0000
committerJan Beich <jbeich@FreeBSD.org>2017-12-01 13:08:27 +0000
commit63897f8410d74811cb1498dd758896337f6743f0 (patch)
tree7237523098fe96d3632836bf8e7e679244f4c5ab
parent385dddb6a6614759231ff50b829bd4a10d4034e0 (diff)
downloadports-63897f8410d74811cb1498dd758896337f6743f0.tar.gz
ports-63897f8410d74811cb1498dd758896337f6743f0.zip
www/firefox: add missing FF57 secfix (direct commit)
Reported by: Waterfox Security: f78eac48-c3d1-4666-8de5-63ceea25a578 Approved by: ports-secteam blanket
Notes
Notes: svn path=/branches/2017Q4/; revision=455286
-rw-r--r--www/firefox/files/patch-bug140180427
1 files changed, 27 insertions, 0 deletions
diff --git a/www/firefox/files/patch-bug1401804 b/www/firefox/files/patch-bug1401804
index c3b4688dc744..d04c5121766d 100644
--- a/www/firefox/files/patch-bug1401804
+++ b/www/firefox/files/patch-bug1401804
@@ -29,3 +29,30 @@ index 5a5dfbe9bed0..0c42d16e7117 100644
}
bool
+commit 3f1085447fa0
+Author: Jon Coppeard <jcoppeard@mozilla.com>
+Date: Wed Sep 27 18:02:12 2017 +0100
+
+ Bug 1401804 - Expose wrappee if we create a new wrapper. r=sfink, a=sledru
+
+ --HG--
+ extra : source : 60fdac23fbc5c4793c276107ce2a1c45759c2a2e
+---
+ js/src/jscompartment.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git js/src/jscompartment.cpp js/src/jscompartment.cpp
+index 7a65c69b55e0..ed024724711f 100644
+--- js/src/jscompartment.cpp
++++ js/src/jscompartment.cpp
+@@ -442,6 +442,10 @@ JSCompartment::getOrCreateWrapper(JSContext* cx, HandleObject existing, MutableH
+ return true;
+ }
+
++ // Ensure that the wrappee is exposed in case we are creating a new wrapper
++ // for a gray object.
++ ExposeObjectToActiveJS(obj);
++
+ // Create a new wrapper for the object.
+ auto wrap = cx->runtime()->wrapObjectCallbacks->wrap;
+ RootedObject wrapper(cx, wrap(cx, existing, obj));