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

[INFER] Handle undefined values added by String.split, bug 620599.

Browse Source
This commit is contained in:
Brian Hackett 2011-03-16 07:40:58 -07:00
parent 3b88d7085b
commit e9a256f847
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/jsstr.cpp
View File

@ -2578,7 +2578,7 @@ class SplitMatchResult {
template<class Matcher>
static JSObject *
SplitHelper(JSContext *cx, JSLinearString *str, uint32 limit, Matcher splitMatch)
SplitHelper(JSContext *cx, JSLinearString *str, uint32 limit, Matcher splitMatch, TypeObject *type)
{
size_t strLength = str->length();
SplitMatchResult result;
@ -2677,6 +2677,9 @@ SplitHelper(JSContext *cx, JSLinearString *str, uint32 limit, Matcher splitMatch
if (!sub || !splits.append(StringValue(sub)))
return NULL;
} else {
/* Only string entries have been accounted for so far. */
if (!cx->addTypePropertyId(type, JSID_VOID, UndefinedValue()))
return NULL;
if (!splits.append(UndefinedValue()))
return NULL;
}
@ -2827,10 +2830,10 @@ str_split(JSContext *cx, uintN argc, Value *vp)
/* Steps 11-15. */
JSObject *aobj;
if (re) {
aobj = SplitHelper(cx, strlin, limit, SplitRegExpMatcher(re, cx->regExpStatics()));
aobj = SplitHelper(cx, strlin, limit, SplitRegExpMatcher(re, cx->regExpStatics()), type);
} else {
// NB: sepstr is anchored through its storage in vp[2].
aobj = SplitHelper(cx, strlin, limit, SplitStringMatcher(sepstr));
aobj = SplitHelper(cx, strlin, limit, SplitStringMatcher(sepstr), type);
}
if (!aobj)
return false;