kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-12 05:05:51 +00:00
Code Issues Projects Releases Wiki Activity

mod_spidermonkey: fix segfaults on dtmf callback (FSCORE-327)

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12577 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-03-11 22:46:46 +00:00
parent 63058fbb64
commit faf8730b3e
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
View File

@ -1104,11 +1104,17 @@ static switch_status_t js_common_callback(switch_core_session_t *session, void *
char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
char var_name[SWITCH_UUID_FORMATTED_LENGTH + 25]; char var_name[SWITCH_UUID_FORMATTED_LENGTH + 25];
char *p; char *p;
switch_status_t status = SWITCH_STATUS_FALSE;
METHOD_SANITY_CHECK(); if (!jss || !jss->session) {
return SWITCH_STATUS_FALSE;
jss->stack_depth++; }
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_get(&uuid);
switch_uuid_format(uuid_str, &uuid); switch_uuid_format(uuid_str, &uuid);
@ -1120,6 +1126,9 @@ static switch_status_t js_common_callback(switch_core_session_t *session, void *
} }
} }
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) { 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) {
@ -1137,8 +1146,7 @@ static switch_status_t js_common_callback(switch_core_session_t *session, void *
} }
} }
if (!Event) { if (!Event) {
jss->stack_depth--; goto done;
return SWITCH_STATUS_FALSE;
} }
break; break;
case SWITCH_INPUT_TYPE_DTMF: case SWITCH_INPUT_TYPE_DTMF:
@ -1150,8 +1158,7 @@ static switch_status_t js_common_callback(switch_core_session_t *session, void *
argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, "dtmf")); argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, "dtmf"));
argv[argc++] = OBJECT_TO_JSVAL(Event); argv[argc++] = OBJECT_TO_JSVAL(Event);
} else { } else {
jss->stack_depth--; goto done;
return SWITCH_STATUS_FALSE;
} }
} }
} }
@ -1162,24 +1169,17 @@ static switch_status_t js_common_callback(switch_core_session_t *session, void *
argv[argc++] = cb_state->arg; 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); check_hangup_hook(jss, &ret);
cb_state->saveDepth = JS_SuspendRequest(cb_state->cx);
if (ret == JS_TRUE) { 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); 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) 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)