diff options
author | Mark H Weaver <mhw@netris.org> | 2014-12-15 18:27:56 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-12-15 20:42:53 -0500 |
commit | 9f8552fab59a250a0c099062937fa057ea6b38b3 (patch) | |
tree | fa1fa890ecaf2a77c8ec91fbeb913350d6ad5608 /gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch | |
parent | bea26837e8f010efde3fdf584f2a158676779ef3 (diff) | |
download | guix-patches-9f8552fab59a250a0c099062937fa057ea6b38b3.tar guix-patches-9f8552fab59a250a0c099062937fa057ea6b38b3.tar.gz |
gnu: icecat: Apply security updates for CVE-2014-{1587,1590,1592,1593,1594}.
* gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch,
gnu/packages/patches/icecat-CVE-2014-1587-bug-1072847.patch,
gnu/packages/patches/icecat-CVE-2014-1587-bug-1079729.patch,
gnu/packages/patches/icecat-CVE-2014-1587-bug-1080312.patch,
gnu/packages/patches/icecat-CVE-2014-1587-bug-1089207.patch,
gnu/packages/patches/icecat-CVE-2014-1590.patch,
gnu/packages/patches/icecat-CVE-2014-1592.patch,
gnu/packages/patches/icecat-CVE-2014-1593.patch,
gnu/packages/patches/icecat-CVE-2014-1594.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/gnuzilla.scm (icecat): Add them.
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch')
-rw-r--r-- | gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch b/gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch new file mode 100644 index 0000000000..4e45e3062f --- /dev/null +++ b/gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch @@ -0,0 +1,30 @@ +commit 60529fc02cf10482d8fecd699eea271ddc22bcb9 +Author: Jason Orendorff <jorendorff@mozilla.com> +Date: Thu Aug 28 15:43:57 2014 -0500 + + Bug 1042567 - Reflect JSPropertyOp properties more consistently as data properties. r=efaust, a=lmandel + + Modified js/src/jsobj.cpp +diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp +index 2745509..ad336f3 100644 +--- a/js/src/jsobj.cpp ++++ b/js/src/jsobj.cpp +@@ -235,11 +235,18 @@ js::GetOwnPropertyDescriptor(JSContext *cx, HandleObject obj, HandleId id, + if (pobj->isNative()) { + desc.setAttributes(GetShapeAttributes(pobj, shape)); + if (desc.hasGetterOrSetterObject()) { ++ MOZ_ASSERT(desc.isShared()); + doGet = false; + if (desc.hasGetterObject()) + desc.setGetterObject(shape->getterObject()); + if (desc.hasSetterObject()) + desc.setSetterObject(shape->setterObject()); ++ } else { ++ // This is either a straight-up data property or (rarely) a ++ // property with a JSPropertyOp getter/setter. The latter must be ++ // reported to the caller as a plain data property, so don't ++ // populate desc.getter/setter, and mask away the SHARED bit. ++ desc.attributesRef() &= ~JSPROP_SHARED; + } + } else { + if (!JSObject::getGenericAttributes(cx, pobj, id, &desc.attributesRef())) |