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

bug 299644: Array.prototype.concat() plugs holes in the existing array.

Browse Source 
r+a=brendan


git-svn-id: svn://10.0.0.236/trunk@175642 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mrbkap%gmail.com 2005-07-05 21:25:12 +00:00
parent 5c307ee46d
commit 1eb8993931
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/js/src/jsarray.c
View File

@ -1274,10 +1274,23 @@ array_concat(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
if (!ValueIsLength(cx, v, &alength))
return JS_FALSE;
for (slot = 0; slot < alength; slot++) {
JSProperty *prop;
JSObject *obj2;
if (!IndexToId(cx, slot, &id))
return JS_FALSE;
if (!IndexToId(cx, length + slot, &id2))
return JS_FALSE;
if (!OBJ_LOOKUP_PROPERTY(cx, aobj, id, &obj2, &prop))
return JS_FALSE;
if (!prop) {
/*
* Per ECMA 262, 15.4.4.4, step 9, ignore non-existent
* properties.
*/
continue;
}
OBJ_DROP_PROPERTY(cx, obj2, prop);
if (!OBJ_GET_PROPERTY(cx, aobj, id, &v))
return JS_FALSE;
if (!OBJ_SET_PROPERTY(cx, nobj, id2, &v))
@ -1295,7 +1308,7 @@ array_concat(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
length++;
}
return JS_TRUE;
return js_SetLengthProperty(cx, nobj, length);
}
static JSBool