Landing the fix for bug 326281. a=timr
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_0_BRANCH@196167 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -4336,6 +4336,7 @@ js_Interpret(JSContext *cx, jsbytecode *pc, jsval *result)
|
||||
|
||||
/* Lookup id in order to check for redeclaration problems. */
|
||||
id = ATOM_TO_JSID(atom);
|
||||
SAVE_SP(fp);
|
||||
ok = js_CheckRedeclaration(cx, obj, id, attrs, &obj2, &prop);
|
||||
if (!ok)
|
||||
goto out;
|
||||
@@ -4461,6 +4462,7 @@ js_Interpret(JSContext *cx, jsbytecode *pc, jsval *result)
|
||||
* as well as multiple HTML script tags.
|
||||
*/
|
||||
parent = fp->varobj;
|
||||
SAVE_SP(fp);
|
||||
ok = js_CheckRedeclaration(cx, parent, id, attrs, NULL, NULL);
|
||||
if (ok) {
|
||||
ok = OBJ_DEFINE_PROPERTY(cx, parent, id, rval,
|
||||
|
||||
Reference in New Issue
Block a user