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

fix MODLANG-41

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5623 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-08-20 16:04:02 +00:00
parent fa204ef943
commit 5eaea5f62a
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2752,24 +2752,31 @@ static JSBool js_bridge(JSContext * cx, JSObject * obj, uintN argc, jsval * argv
struct input_callback_state cb_state = { 0 }; struct input_callback_state cb_state = { 0 };
JSFunction *function; JSFunction *function;
*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
if (argc > 1) { if (argc > 1) {
if (JS_ValueToObject(cx, argv[0], &session_obj_a)) { if (JS_ValueToObject(cx, argv[0], &session_obj_a)) {
if (!(jss_a = JS_GetPrivate(cx, session_obj_a))) { if (!(jss_a = JS_GetPrivate(cx, session_obj_a))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Find Session [1]\n"); eval_some_js("~throw new Error(\"Cannot find session A\");", cx, obj, rval);
return JS_FALSE; return JS_TRUE;
} }
} }
if (JS_ValueToObject(cx, argv[1], &session_obj_b)) { if (JS_ValueToObject(cx, argv[1], &session_obj_b)) {
if (!(jss_b = JS_GetPrivate(cx, session_obj_b))) { if (!(jss_b = JS_GetPrivate(cx, session_obj_b))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Find Session [1]\n"); eval_some_js("~throw new Error(\"Cannot find session B\");", cx, obj, rval);
return JS_FALSE; return JS_TRUE;
} }
} }
} }
if (!(jss_a && jss_b)) { if (!(jss_a && jss_a->session)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure! %s %s\n", jss_a ? "y" : "n", jss_b ? "y" : "n"); eval_some_js("~throw new Error(\"session A is not ready!\");", cx, obj, rval);
return JS_FALSE; return JS_TRUE;
}
if (!(jss_b && jss_b->session)) {
eval_some_js("~throw new Error(\"session B is not ready!\");", cx, obj, rval);
return JS_TRUE;
} }
@ -2796,6 +2803,7 @@ static JSBool js_bridge(JSContext * cx, JSObject * obj, uintN argc, jsval * argv
switch_ivr_multi_threaded_bridge(jss_a->session, jss_b->session, dtmf_func, bp, bp); switch_ivr_multi_threaded_bridge(jss_a->session, jss_b->session, dtmf_func, bp, bp);
JS_ResumeRequest(cx, cb_state.saveDepth); JS_ResumeRequest(cx, cb_state.saveDepth);
*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
return JS_TRUE; return JS_TRUE;
} }

3
src/switch_ivr_bridge.c
View File

@ -551,6 +551,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
int stream_id = 0; int stream_id = 0;
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
assert(session != NULL);
assert(peer_session != NULL);
caller_channel = switch_core_session_get_channel(session); caller_channel = switch_core_session_get_channel(session);
assert(caller_channel != NULL); assert(caller_channel != NULL);