mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-06-04 12:21:54 +00:00
fix bug in apiExecute
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10413 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
d16cbd53e4
commit
dfa101177c
@ -3317,7 +3317,6 @@ static JSBool js_api_execute(JSContext * cx, JSObject * obj, uintN argc, jsval *
|
|||||||
char *arg = NULL;
|
char *arg = NULL;
|
||||||
switch_core_session_t *session = NULL;
|
switch_core_session_t *session = NULL;
|
||||||
switch_stream_handle_t stream = { 0 };
|
switch_stream_handle_t stream = { 0 };
|
||||||
char retbuf[2048] = "";
|
|
||||||
|
|
||||||
if (!strcasecmp(cmd, "jsapi")) {
|
if (!strcasecmp(cmd, "jsapi")) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid API Call!\n");
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid API Call!\n");
|
||||||
@ -3339,13 +3338,12 @@ static JSBool js_api_execute(JSContext * cx, JSObject * obj, uintN argc, jsval *
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stream.data = retbuf;
|
SWITCH_STANDARD_STREAM(stream);
|
||||||
stream.end = stream.data;
|
|
||||||
stream.data_size = sizeof(retbuf);
|
|
||||||
stream.write_function = switch_console_stream_write;
|
|
||||||
switch_api_execute(cmd, arg, session, &stream);
|
switch_api_execute(cmd, arg, session, &stream);
|
||||||
|
|
||||||
*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, retbuf));
|
*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_str_nil((char *)stream.data)));
|
||||||
|
switch_safe_free(stream.data);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, ""));
|
*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, ""));
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user