Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix JSOP_SETSP (and an assertion in JSOP_LEAVEBLOCK*) to cope with empty destructuring (355832, r=mrbkap).

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@215487 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brendan%mozilla.org
2006-11-20 19:30:41 +00:00
parent f1959a5f87
commit c7a38e1687
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/js/src/jsinterp.c
View File

@@ -5320,8 +5320,10 @@ interrupt:
for (obj = fp->blockChain; obj; obj = OBJ_GET_PARENT(cx, obj)) {
JS_ASSERT(OBJ_GET_CLASS(cx, obj) == &js_BlockClass);
if (OBJ_BLOCK_DEPTH(cx, obj) < i)
if (OBJ_BLOCK_DEPTH(cx, obj) + OBJ_BLOCK_COUNT(cx, obj) <= i) {
JS_ASSERT(OBJ_BLOCK_DEPTH(cx, obj) < i || OBJ_BLOCK_COUNT(cx, obj) == 0);
break;
}
}
fp->blockChain = obj;
@@ -5869,9 +5871,7 @@ interrupt:
}
sp -= GET_UINT16(pc);
JS_ASSERT(op == JSOP_LEAVEBLOCKEXPR
? fp->spbase < sp && sp <= fp->spbase + depth
: fp->spbase <= sp && sp < fp->spbase + depth);
JS_ASSERT(fp->spbase <= sp && sp <= fp->spbase + depth);
/* Store the result into the topmost stack slot. */
if (op == JSOP_LEAVEBLOCKEXPR)