Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1144802 part 5. Flag eval scripts as having a polluted scopechain when inside a with scope. r=luke

Browse Source
This commit is contained in:
Boris Zbarsky 2015-03-20 00:34:08 -04:00
parent a845fadd21
commit 80c254b355
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/src/builtin/Eval.cpp
View File

@ -212,6 +212,18 @@ TryEvalJSON(JSContext *cx, JSLinearString *str, MutableHandleValue rval)
: ParseEvalStringAsJSON(cx, linearChars.twoByteRange(), rval);
}
static bool
HasPollutedScopeChain(JSObject* scopeChain)
{
while (scopeChain) {
if (scopeChain->is<DynamicWithObject>())
return true;
scopeChain = scopeChain->enclosingScope();
}
return false;
}
// Define subset of ExecuteType so that casting performs the injection.
enum EvalType { DIRECT_EVAL = EXECUTE_DIRECT_EVAL, INDIRECT_EVAL = EXECUTE_INDIRECT_EVAL };
@ -314,11 +326,14 @@ EvalKernel(JSContext *cx, const CallArgs &args, EvalType evalType, AbstractFrame
if (!staticScope)
return false;
bool hasPollutedGlobalScope =
HasPollutedScopeChain(scopeobj) ||
(evalType == DIRECT_EVAL && callerScript->hasPollutedGlobalScope());
CompileOptions options(cx);
options.setFileAndLine(filename, 1)
.setCompileAndGo(true)
.setHasPollutedScope(evalType == DIRECT_EVAL &&
callerScript->hasPollutedGlobalScope())
.setHasPollutedScope(hasPollutedGlobalScope)
.setForEval(true)
.setNoScriptRval(false)
.setMutedErrors(mutedErrors)
@ -401,7 +416,8 @@ js::DirectEvalStringFromIon(JSContext *cx,
CompileOptions options(cx);
options.setFileAndLine(filename, 1)
.setCompileAndGo(true)
.setHasPollutedScope(callerScript->hasPollutedGlobalScope())
.setHasPollutedScope(HasPollutedScopeChain(scopeobj) ||
callerScript->hasPollutedGlobalScope())
.setForEval(true)
.setNoScriptRval(false)
.setMutedErrors(mutedErrors)