[Freeswitch-svn] [commit] r12577 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
FreeSWITCH SVN
mikej at freeswitch.org
Wed Mar 11 15:46:46 PDT 2009
Author: mikej
Date: Wed Mar 11 17:46:46 2009
New Revision: 12577
Log:
mod_spidermonkey: fix segfaults on dtmf callback (FSCORE-327)
Modified:
freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
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 Wed Mar 11 17:46:46 2009
@@ -1104,11 +1104,17 @@
char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
char var_name[SWITCH_UUID_FORMATTED_LENGTH + 25];
char *p;
+ switch_status_t status = SWITCH_STATUS_FALSE;
- METHOD_SANITY_CHECK();
-
- jss->stack_depth++;
+ if (!jss || !jss->session) {
+ return SWITCH_STATUS_FALSE;
+ }
+ if (++jss->stack_depth > MAX_STACK_DEPTH) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Maximum recursive callback limit %d reached.\n", MAX_STACK_DEPTH);
+ jss->stack_depth--;
+ return SWITCH_STATUS_FALSE;
+ }
switch_uuid_get(&uuid);
switch_uuid_format(uuid_str, &uuid);
@@ -1120,6 +1126,9 @@
}
}
+ JS_ResumeRequest(cb_state->cx, cb_state->saveDepth);
+ METHOD_SANITY_CHECK();
+
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) {
@@ -1137,8 +1146,7 @@
}
}
if (!Event) {
- jss->stack_depth--;
- return SWITCH_STATUS_FALSE;
+ goto done;
}
break;
case SWITCH_INPUT_TYPE_DTMF:
@@ -1150,8 +1158,7 @@
argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, "dtmf"));
argv[argc++] = OBJECT_TO_JSVAL(Event);
} else {
- jss->stack_depth--;
- return SWITCH_STATUS_FALSE;
+ goto done;
}
}
}
@@ -1162,24 +1169,17 @@
argv[argc++] = cb_state->arg;
}
- if (jss->stack_depth > MAX_STACK_DEPTH) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Maximum recursive callback limit %d reached.\n", MAX_STACK_DEPTH);
- jss->stack_depth--;
- return SWITCH_STATUS_FALSE;
- }
-
- JS_ResumeRequest(cb_state->cx, cb_state->saveDepth);
check_hangup_hook(jss, &ret);
- cb_state->saveDepth = JS_SuspendRequest(cb_state->cx);
if (ret == JS_TRUE) {
- JS_ResumeRequest(cb_state->cx, cb_state->saveDepth);
JS_CallFunction(cb_state->cx, cb_state->obj, cb_state->function, argc, argv, &cb_state->ret);
- cb_state->saveDepth = JS_SuspendRequest(cb_state->cx);
- jss->stack_depth--;
}
- return SWITCH_STATUS_SUCCESS;
+ status = SWITCH_STATUS_SUCCESS;
+done:
+ cb_state->saveDepth = JS_SuspendRequest(cb_state->cx);
+ jss->stack_depth--;
+ return status;
}
static switch_status_t js_stream_input_callback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)
More information about the Freeswitch-svn
mailing list