Author: anthm Date: Fri Dec 28 17:04:56 2007 New Revision: 7007 Modified: freeswitch/trunk/libs/js/src/jsexn.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix spidermonkey issue Modified: freeswitch/trunk/libs/js/src/jsexn.c ============================================================================== --- freeswitch/trunk/libs/js/src/jsexn.c (original) +++ freeswitch/trunk/libs/js/src/jsexn.c Fri Dec 28 17:04:56 2007 @@ -425,6 +425,7 @@ APPEND_CHAR_TO_STACK('('); for (i = 0; i < fp->argc; i++) { + /* Avoid toSource bloat and fallibility for object types. */ v = fp->argv[i]; if (JSVAL_IS_PRIMITIVE(v)) { Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Fri Dec 28 17:04:56 2007 @@ -1120,13 +1120,12 @@ jss->stack_depth++; - if (cb_state->jss_a && cb_state->jss_a->session && cb_state->jss_a->session == session) { argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_obj_a); } else if (cb_state->jss_b && cb_state->jss_b->session && cb_state->jss_b->session == session) { argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_obj_b); } else { - argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_state); + argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_state->obj); } switch (itype) {