提交 ef563f04 authored 作者: Anthony Minessale's avatar Anthony Minessale

fix spidermonkey issue

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7007 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 04e33f19
...@@ -425,6 +425,7 @@ InitExceptionObject(JSContext *cx, JSObject *obj, JSString *message, ...@@ -425,6 +425,7 @@ InitExceptionObject(JSContext *cx, JSObject *obj, JSString *message,
APPEND_CHAR_TO_STACK('('); APPEND_CHAR_TO_STACK('(');
for (i = 0; i < fp->argc; i++) { for (i = 0; i < fp->argc; i++) {
/* Avoid toSource bloat and fallibility for object types. */ /* Avoid toSource bloat and fallibility for object types. */
v = fp->argv[i]; v = fp->argv[i];
if (JSVAL_IS_PRIMITIVE(v)) { if (JSVAL_IS_PRIMITIVE(v)) {
......
...@@ -1120,13 +1120,12 @@ static switch_status_t js_common_callback(switch_core_session_t *session, void * ...@@ -1120,13 +1120,12 @@ static switch_status_t js_common_callback(switch_core_session_t *session, void *
jss->stack_depth++; jss->stack_depth++;
if (cb_state->jss_a && cb_state->jss_a->session && cb_state->jss_a->session == session) { 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); 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) { } 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); argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_obj_b);
} else { } else {
argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_state); argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_state->obj);
} }
switch (itype) { switch (itype) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论