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

Changed handling of undefined limit and negative limit values to

Browse Source 
String.split()


git-svn-id: svn://10.0.0.236/trunk@45175 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rogerl%netscape.com
1999-08-30 22:05:56 +00:00
parent 1943b41acc
commit 8b4e51dfee
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/js/src/jsstr.c
View File

@@ -1413,7 +1413,8 @@ str_split(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
JSRegExp *re;
JSSubString *sep, tmp;
jsdouble d;
jsint len, limit, i, j, sublen;
jsint i, j, sublen;
uint32 len, limit;
const jschar *substr;
str = js_ValueToString(cx, OBJECT_TO_JSVAL(obj));
@@ -1457,20 +1458,17 @@ str_split(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
}
/* Use the second argument as the split limit, if given. */
/* XXX our v2 ecma spec checks against given, undefined. */
limited = (argc > 1);
limited = (argc > 1) && !JSVAL_IS_VOID(argv[1]);
limit = 0; /* Avoid warning. */
if (limited) {
if (!js_ValueToNumber(cx, argv[1], &d))
if (!js_ValueToNumber(cx, argv[1], &d))
return JS_FALSE;
/* Clamp limit between 0 and 1 + string length. */
d = js_DoubleToInteger(d);
if (d < 0)
d = 0;
else if (d > str->length)
d = 1 + str->length;
limit = (jsint)d;
if (!js_DoubleToECMAUint32(cx, d, &limit))
return JS_FALSE;
if (limit > str->length)
limit = 1 + str->length;
}
if (reobj) {