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

bug 369696 - improving object graph serialization. r=brendan

Browse Source
This commit is contained in:
Igor Bukanov
2009-03-17 09:51:38 +01:00
parent b22ee55115
commit 868d2be954
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsarray.cpp
View File

@@ -1317,7 +1317,12 @@ array_join_sub(JSContext *cx, JSObject *obj, enum ArrayToStringOp op,
growth = (size_t) -1; growth = (size_t) -1;
#endif #endif
if (op == TO_SOURCE) { /*
* We must check for the sharp bit and skip js_LeaveSharpObject when it is
* set even when op is not TO_SOURCE. A script can overwrite the default
* toSource implementation and trigger a call, for example, to the
* toString method during serialization of the object graph (bug 369696).
*/
if (IS_SHARP(he)) { if (IS_SHARP(he)) {
#if JS_HAS_SHARP_VARS #if JS_HAS_SHARP_VARS
nchars = js_strlen(chars); nchars = js_strlen(chars);
@@ -1330,6 +1335,7 @@ array_join_sub(JSContext *cx, JSObject *obj, enum ArrayToStringOp op,
goto make_string; goto make_string;
} }
if (op == TO_SOURCE) {
/* /*
* Always allocate 2 extra chars for closing ']' and terminating 0 * Always allocate 2 extra chars for closing ']' and terminating 0
* and then preallocate 1 + extratail to include starting '['. * and then preallocate 1 + extratail to include starting '['.