Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow for nested filtering expressions in flag-setting and restoring (352605, r=jwalden).

Browse Source
This commit is contained in:
brendan%mozilla.org 2006-09-14 04:44:29 +00:00
parent 5f0d68e853
commit b7df3a74ce
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/jsxml.c
View File

@ -7962,9 +7962,9 @@ js_FilterXMLList(JSContext *cx, JSObject *obj, jsbytecode *pc, jsval *vp)
{
JSBool ok, match;
JSStackFrame *fp;
uint32 flags, i, n;
JSObject *scobj, *listobj, *resobj, *withobj, *kidobj;
JSXML *xml, *list, *result, *kid;
uint32 i, n;
ok = js_EnterLocalRootScope(cx);
if (!ok)
@ -7973,7 +7973,8 @@ js_FilterXMLList(JSContext *cx, JSObject *obj, jsbytecode *pc, jsval *vp)
/* All control flow after this point must exit via label out or bad. */
*vp = JSVAL_NULL;
fp = cx->fp;
fp->flags |= JSFRAME_FILTERING;
flags = fp->flags;
fp->flags = flags | JSFRAME_FILTERING;
scobj = js_GetScopeChain(cx, fp);
withobj = NULL;
if (!scobj)
@ -8024,7 +8025,7 @@ js_FilterXMLList(JSContext *cx, JSObject *obj, jsbytecode *pc, jsval *vp)
*vp = OBJECT_TO_JSVAL(resobj);
out:
fp->flags &= ~JSFRAME_FILTERING;
fp->flags = flags;
if (withobj) {
fp->scopeChain = scobj;
JS_SetPrivate(cx, withobj, NULL);