зеркало из https://github.com/mozilla/pjs.git
Avoid indexing into fp->vars with wrong atomIndex (244470, r=self).
This commit is contained in:
Родитель
d502b5948b
Коммит
e158b43df0
|
@ -4423,6 +4423,7 @@ js_Interpret(JSContext *cx, jsval *result)
|
||||||
if (!ok)
|
if (!ok)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
#if 0
|
||||||
if (attrs == (JSPROP_ENUMERATE | JSPROP_PERMANENT) &&
|
if (attrs == (JSPROP_ENUMERATE | JSPROP_PERMANENT) &&
|
||||||
script->numGlobalVars) {
|
script->numGlobalVars) {
|
||||||
/*
|
/*
|
||||||
|
@ -4433,6 +4434,7 @@ js_Interpret(JSContext *cx, jsval *result)
|
||||||
sprop = (JSScopeProperty *) prop;
|
sprop = (JSScopeProperty *) prop;
|
||||||
fp->vars[atomIndex] = INT_TO_JSVAL(sprop->slot);
|
fp->vars[atomIndex] = INT_TO_JSVAL(sprop->slot);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
OBJ_DROP_PROPERTY(cx, parent, prop);
|
OBJ_DROP_PROPERTY(cx, parent, prop);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -4633,6 +4635,7 @@ js_Interpret(JSContext *cx, jsval *result)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
if (attrs == 0 && script->numGlobalVars) {
|
if (attrs == 0 && script->numGlobalVars) {
|
||||||
/*
|
/*
|
||||||
* As with JSOP_DEFVAR and JSOP_DEFCONST (above), fast globals
|
* As with JSOP_DEFVAR and JSOP_DEFCONST (above), fast globals
|
||||||
|
@ -4642,6 +4645,7 @@ js_Interpret(JSContext *cx, jsval *result)
|
||||||
sprop = (JSScopeProperty *) prop;
|
sprop = (JSScopeProperty *) prop;
|
||||||
fp->vars[atomIndex] = INT_TO_JSVAL(sprop->slot);
|
fp->vars[atomIndex] = INT_TO_JSVAL(sprop->slot);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
OBJ_DROP_PROPERTY(cx, parent, prop);
|
OBJ_DROP_PROPERTY(cx, parent, prop);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче