eval to get global, not Function

drses · Mar 13, 2016 · 943cf9b · 943cf9b
1 parent 320dd02
commit 943cf9b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/debug.js b/debug.js
@@ -94,7 +94,7 @@ var ses;
    "use strict";
 
    // Still valid. Won't be after startSES is called.
-   var global = (new Function('return this;'))();
+   var global = (1,eval)('this');
 
    if (typeof ses !== 'undefined' && ses.okToLoad && !ses.okToLoad()) {
      // already too broken, so give up

diff --git a/hookupSESPlus.js b/hookupSESPlus.js
@@ -28,7 +28,7 @@
   "use strict";
 
   // Still valid. Won't be after startSES is called.
-  var global = (new Function('return this;'))();
+  var global = (1,eval)('this');
 
   try {
     if (!ses.okToLoad()) {

diff --git a/repairES5.js b/repairES5.js
@@ -99,7 +99,7 @@ var ses;
   "use strict";
 
   // Still valid. Won't be after startSES is called.
-  var global = (new Function('return this;'))();
+  var global = (1,eval)('this');
 
   var logger = ses.logger;
   var EarlyStringMap = ses._EarlyStringMap;

diff --git a/ses-usage.js b/ses-usage.js
@@ -22,7 +22,7 @@ ses.maxAcceptableSeverityName = 'NEW_SYMPTOM';
 
 (${function() {
   "use strict";
-  console.log('a ', global === (new Function('return this;')()));
+  console.log('a ', global === (1,eval)('this'));
 }}());
 `;
 
@@ -42,6 +42,7 @@ var testCases = `
   console.log(cajaVM.confine('x + y', {x: 3, y: 4}));
 }}());
 
+cajaVM.confine
 `;
 
 var sesFiles = [
@@ -78,4 +79,5 @@ var global = {};
 global.console = console;
 global.global = global;
 var context = VM.createContext(global);
-VM.runInContext(initSES, context);
+var ret = VM.runInContext(initSES, context);
+console.log('ret: ', ret);