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

bug 407428. stack allocate small strings in js_XDRStringAtom instead of instead of using the tempPool arena to allocate them. r=brendan,igor

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@240793 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pavlov%pavlov.net
2007-12-11 08:36:29 +00:00
parent b3cc6d9535
commit 3f3dd1a810
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/js/src/jsxdrapi.c
View File

@@ -644,8 +644,8 @@ js_XDRStringAtom(JSXDRState *xdr, JSAtom **atomp)
uint32 nchars;
JSAtom *atom;
JSContext *cx;
void *mark;
jschar *chars;
jschar stackChars[256];
if (xdr->mode == JSXDR_ENCODE) {
JS_ASSERT(ATOM_IS_STRING(*atomp));
@@ -661,14 +661,23 @@ js_XDRStringAtom(JSXDRState *xdr, JSAtom **atomp)
return JS_FALSE;
atom = NULL;
cx = xdr->cx;
mark = JS_ARENA_MARK(&cx->tempPool);
JS_ARENA_ALLOCATE_CAST(chars, jschar *, &cx->tempPool,
nchars * sizeof(jschar));
if (!chars)
js_ReportOutOfScriptQuota(cx);
else if (XDRChars(xdr, chars, nchars))
if (nchars <= JS_ARRAY_LENGTH(stackChars)) {
chars = stackChars;
} else {
/*
* This is very uncommon. Don't use the tempPool arena for this as
* most allocations here will be bigger than tempPool's arenasize.
*/
chars = (jschar *) JS_malloc(cx, nchars * sizeof(jschar));
if (!chars)
return JS_FALSE;
}
if (XDRChars(xdr, chars, nchars))
atom = js_AtomizeChars(cx, chars, nchars, 0);
JS_ARENA_RELEASE(&cx->tempPool, mark);
if (chars != stackChars)
JS_free(cx, chars);
if (!atom)
return JS_FALSE;
*atomp = atom;