wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

[INFER] Add monitoring for premature returns in JSOP_NAME, bug 642412.

Browse Source
This commit is contained in:
Brian Hackett 2011-03-19 17:03:18 -07:00
parent f9a4f63af8
commit 99c7da4cca
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/jsinterp.cpp
View File

@ -5009,6 +5009,11 @@ BEGIN_CASE(JSOP_CALLNAME)
PUSH_COPY(rval);
}
if (op == JSOP_NAME || op == JSOP_CALLNAME) {
if (!script->typeMonitorResult(cx, regs.pc, regs.sp[-1]))
goto error;
}
JS_ASSERT(obj->isGlobal() || IsCacheableNonGlobalScope(obj));
if (op == JSOP_CALLNAME || op == JSOP_CALLGNAME)
PUSH_IMPLICIT_THIS(cx, obj, regs.sp[-1]);
@ -5026,6 +5031,8 @@ BEGIN_CASE(JSOP_CALLNAME)
JSOp op2 = js_GetOpcode(cx, script, regs.pc + JSOP_NAME_LENGTH);
if (op2 == JSOP_TYPEOF) {
PUSH_UNDEFINED();
if (!script->typeMonitorUndefined(cx, regs.pc))
goto error;
len = JSOP_NAME_LENGTH;
DO_NEXT_OP(len);
}

2
js/src/methodjit/StubCalls.cpp
View File

@ -377,6 +377,8 @@ NameOp(VMFrame &f, JSObject *obj, bool markresult, bool callname)
if (op2 == JSOP_TYPEOF) {
f.regs.sp++;
f.regs.sp[-1].setUndefined();
if (!f.script()->typeMonitorUndefined(cx, f.regs.pc))
return NULL;
return obj;
}
ReportAtomNotDefined(cx, atom);