Commita23473b

committed

Merge pull requestjhnns#36 from claydotio/you-dont-even-want-to-know-how-long-this-took-to-find

Ignore invalid variable names during injection of global params

2 parents79aac24 +15dc51b commita23473bCopy full SHA for a23473b

File tree

+12

-3

lines changed

+12

-3

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,15 @@ function getImportGlobalsSrc(ignore) {`
`26`	`26`	`continue;`
`27`	`27`	`}`
`28`	`28`	`value=globalObj[key];`
`29`		`-src+="var "+key+" = global."+key+"; ";`
	`29`	`+`
	`30`	`+// key may be an invalid variable name (e.g. 'a-b')`
	`31`	`+try{`
	`32`	`+eval("var "+key+";");`
	`33`	`+src+="var "+key+" = global."+key+"; ";`
	`34`	`+}catch(e){}`
`30`	`35`	`}`
`31`	`36`
`32`	`37`	`returnsrc;`
`33`	`38`	`}`
`34`	`39`
`35`		`-module.exports=getImportGlobalsSrc;`
	`40`	`+module.exports=getImportGlobalsSrc;`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,15 @@ describe("getImportGlobalsSrc", function () {`
`17`	`17`	`global.exports=exports;`
`18`	`18`	`global.require=require;`
`19`	`19`
	`20`	`+// Also make sure it ignores invalid variable names`
	`21`	`+global['a-b']=true;`
	`22`	`+`
`20`	`23`	`src=getImportGlobalsSrc();`
`21`	`24`
`22`	`25`	`deleteglobal.module;`
`23`	`26`	`deleteglobal.exports;`
`24`	`27`	`deleteglobal.require;`
	`28`	`+deleteglobal['a-b'];`
`25`	`29`
`26`	`30`	`expectedGlobals=Object.keys(global);`
`27`	`31`
`@@ -63,4 +67,4 @@ describe("getImportGlobalsSrc", function () {`
`63`	`67`	`expect(actualGlobals).to.eql(expectedGlobals);`
`64`	`68`	`expect(actualGlobals.length).to.be.above(1);`
`65`	`69`	`});`
`66`		`-});`
	`70`	`+});`

Comments

(0)