gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-26 19:35:46 +01:00
Code Issues Projects Releases Wiki Activity

Guard against horrible eval-based monkey patching of our overlay functions.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-12 21:22:50 -05:00
parent 11127c5a7d
commit 345752354f
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
common/modules/util.jsm
View File

@@ -1144,7 +1144,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
let original = Object.create(object); let original = Object.create(object);
overrides = update(Object.create(original), overrides); overrides = update(Object.create(original), overrides);
for each (let k in Object.getOwnPropertyNames(overrides)) { Object.getOwnPropertyNames(overrides).forEach(function (k) {
let orig, desc = Object.getOwnPropertyDescriptor(overrides, k); let orig, desc = Object.getOwnPropertyDescriptor(overrides, k);
if (desc.value instanceof Class.Property) if (desc.value instanceof Class.Property)
desc = desc.value.init(k) || desc.value; desc = desc.value.init(k) || desc.value;
@@ -1153,8 +1153,31 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
if (orig = Object.getOwnPropertyDescriptor(obj, k)) if (orig = Object.getOwnPropertyDescriptor(obj, k))
Object.defineProperty(original, k, orig); Object.defineProperty(original, k, orig);
// Guard against horrible add-ons that use eval-based monkey
// patching.
if (callable(desc.value)) {
let value = desc.value;
let sentinel = "(function DactylOverlay() {}())"
value.toString = function toString() toString.toString.call(this).replace(/\}?$/, sentinel + "; $&");
value.toSource = function toSource() toString.toSource.call(this).replace(/\}?$/, sentinel + "; $&");
delete desc.value;
delete desc.writable;
desc.get = function get() value;
desc.set = function set(val) {
if (String(val).indexOf(sentinel) < 0)
Class.replaceProperty(this, k, val);
else {
util.reportError(Error("Not replacing property with eval-generated overlay"));
util.dactyl.echoerr("Not replacing property with eval-generated overlay");
}
};
}
Object.defineProperty(object, k, desc); Object.defineProperty(object, k, desc);
} }, this);
return function unwrap() { return function unwrap() {
for each (let k in Object.getOwnPropertyNames(original)) for each (let k in Object.getOwnPropertyNames(original))
Object.defineProperty(object, k, Object.getOwnPropertyDescriptor(original, k)); Object.defineProperty(object, k, Object.getOwnPropertyDescriptor(original, k));