Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix obj_getCount to property destroy state and propagate error (r=jband)

Browse Source
This commit is contained in:
shaver%netscape.com 1999-10-15 04:32:46 +00:00
parent 6762dd27f5
commit 34010403ff
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/src/jsobj.c
View File

@ -168,25 +168,26 @@ obj_setSlot(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
static JSBool
obj_getCount(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
{
jsval iter_state;
jsval iter_state = JSVAL_NULL;
jsid num_properties;
iter_state = JSVAL_NULL;
JSBool ok = JS_FALSE;
/* Get the number of properties to enumerate. */
if (!OBJ_ENUMERATE(cx, obj, JSENUMERATE_INIT, &iter_state, &num_properties))
goto error;
goto out;
if (!JSVAL_IS_INT(num_properties)) {
JS_ASSERT(0);
goto error;
goto out;
}
*vp = num_properties;
return JS_TRUE;
ok = JS_TRUE;
error:
if (iter_state != JSVAL_NULL)
OBJ_ENUMERATE(cx, obj, JSENUMERATE_DESTROY, &iter_state, 0);
return JS_FALSE;
out:
if (iter_state != JSVAL_NULL &&
!OBJ_ENUMERATE(cx, obj, JSENUMERATE_DESTROY, &iter_state, 0))
ok = JS_FALSE;
return ok;
}
#else /* !JS_HAS_OBJ_PROTO_PROP */