corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 617935: Check string lengths using StringBuffer. (r=lw)

Browse Source
This commit is contained in:
Chris Leary
2011-01-12 15:28:58 -08:00
parent cae5b716f6
commit 6164d16533
21 changed files with 453 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
js/src/jsarray.cpp
View File

@@ -1080,9 +1080,9 @@ JSObject::makeDenseArraySlow(JSContext *cx)
/* Transfer ownership of buffer to returned string. */
static inline JSBool
BufferToString(JSContext *cx, JSCharBuffer &cb, Value *rval)
BufferToString(JSContext *cx, StringBuffer &sb, Value *rval)
{
JSString *str = js_NewStringFromCharBuffer(cx, cb);
JSString *str = sb.finishString();
if (!str)
return false;
rval->setString(str);
@@ -1117,28 +1117,28 @@ array_toSource(JSContext *cx, uintN argc, Value *vp)
* This object will take responsibility for the jschar buffer until the
* buffer is transferred to the returned JSString.
*/
JSCharBuffer cb(cx);
StringBuffer sb(cx);
/* Cycles/joins are indicated by sharp objects. */
#if JS_HAS_SHARP_VARS
if (IS_SHARP(he)) {
JS_ASSERT(sharpchars != 0);
cb.replaceRawBuffer(sharpchars, js_strlen(sharpchars));
sb.replaceRawBuffer(sharpchars, js_strlen(sharpchars));
goto make_string;
} else if (sharpchars) {
MAKE_SHARP(he);
cb.replaceRawBuffer(sharpchars, js_strlen(sharpchars));
sb.replaceRawBuffer(sharpchars, js_strlen(sharpchars));
}
#else
if (IS_SHARP(he)) {
if (!js_AppendLiteral(cb, "[]"))
if (!sb.append("[]"))
goto out;
cx->free(sharpchars);
goto make_string;
}
#endif
if (!cb.append('['))
if (!sb.append('['))
goto out;
jsuint length;
@@ -1169,23 +1169,23 @@ array_toSource(JSContext *cx, uintN argc, Value *vp)
goto out;
/* Append element to buffer. */
if (!cb.append(chars, chars + str->length()))
if (!sb.append(chars, chars + str->length()))
goto out;
if (index + 1 != length) {
if (!js_AppendLiteral(cb, ", "))
if (!sb.append(", "))
goto out;
} else if (hole) {
if (!cb.append(','))
if (!sb.append(','))
goto out;
}
}
/* Finalize the buffer. */
if (!cb.append(']'))
if (!sb.append(']'))
goto out;
make_string:
if (!BufferToString(cx, cb, vp))
if (!BufferToString(cx, sb, vp))
goto out;
ok = true;
@@ -1245,7 +1245,7 @@ array_toString_sub(JSContext *cx, JSObject *obj, JSBool locale,
* This object will take responsibility for the jschar buffer until the
* buffer is transferred to the returned JSString.
*/
JSCharBuffer cb(cx);
StringBuffer sb(cx);
jsuint length;
if (!js_GetLengthProperty(cx, obj, &length))
@@ -1273,19 +1273,19 @@ array_toString_sub(JSContext *cx, JSObject *obj, JSBool locale,
goto out;
}
if (!js_ValueToCharBuffer(cx, *rval, cb))
if (!ValueToStringBuffer(cx, *rval, sb))
goto out;
}
/* Append the separator. */
if (index + 1 != length) {
if (!cb.append(sep, seplen))
if (!sb.append(sep, seplen))
goto out;
}
}
/* Finalize the buffer. */
if (!BufferToString(cx, cb, rval))
if (!BufferToString(cx, sb, rval))
goto out;
ok = true;