gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-31 01:13:36 +02:00
Code Issues Projects Releases Wiki Activity

Don't use a sandbox for the command-line. I'm tired of "can't wrap XML objects" and random untoward crashes.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-16 12:49:28 -05:00
parent 5b56624043
commit 681a7ab55c
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
common/content/dactyl.js
View File

@@ -13,7 +13,8 @@ XML.ignoreWhitespace = false;
XML.prettyPrinting = false; XML.prettyPrinting = false;
var plugins = { __proto__: modules }; var plugins = { __proto__: modules };
var userContext = newContext(modules); var userContext = { __proto__: modules };
var _userContext = newContext(userContext);
var EVAL_ERROR = "__dactyl_eval_error"; var EVAL_ERROR = "__dactyl_eval_error";
var EVAL_RESULT = "__dactyl_eval_result"; var EVAL_RESULT = "__dactyl_eval_result";
@@ -360,13 +361,35 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
userEval: function (str, context, fileName, lineNumber) { userEval: function (str, context, fileName, lineNumber) {
if (fileName == null) if (fileName == null)
if (io.sourcing) if (io.sourcing && io.sourcing.file[0] !== "[")
({ file: fileName, line: lineNumber }) = io.sourcing; ({ file: fileName, line: lineNumber }) = io.sourcing;
else if (String.indexOf(commandline.command, str) > -1) else try {
[fileName, lineNumber] = ["[Command Line]", 1]; util.dump("what the fuck?");
if (!context)
context = userContext;
context[EVAL_ERROR] = null;
context[EVAL_STRING] = str;
context[EVAL_RESULT] = null;
this.loadScript("resource://dactyl-content/eval.js", context);
if (context[EVAL_ERROR]) {
try {
context[EVAL_ERROR].fileName = io.sourcing.file;
context[EVAL_ERROR].lineNumber += io.sourcing.line;
}
catch (e) {}
throw context[EVAL_ERROR];
}
return context[EVAL_RESULT];
}
finally {
delete context[EVAL_ERROR];
delete context[EVAL_RESULT];
delete context[EVAL_STRING];
}
if (!context) if (!context)
context = userContext; context = _userContext;
if (window.isPrototypeOf(modules)) if (window.isPrototypeOf(modules))
return Cu.evalInSandbox(str, context, "1.8", fileName, lineNumber); return Cu.evalInSandbox(str, context, "1.8", fileName, lineNumber);
return Cu.evalInSandbox("with (window) { with (modules) { this.eval(" + str.quote() + ") } }", context, "1.8", fileName, lineNumber); return Cu.evalInSandbox("with (window) { with (modules) { this.eval(" + str.quote() + ") } }", context, "1.8", fileName, lineNumber);