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

update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8033 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 5777371e
...@@ -165,7 +165,11 @@ static switch_status_t caller_read_frame_callback(switch_core_session_t *session ...@@ -165,7 +165,11 @@ static switch_status_t caller_read_frame_callback(switch_core_session_t *session
{ {
fifo_chime_data_t *cd = (fifo_chime_data_t *) user_data; fifo_chime_data_t *cd = (fifo_chime_data_t *) user_data;
if (cd && cd->total && switch_timestamp(NULL) >= cd->next) { if (!cd) {
return SWITCH_STATUS_SUCCESS;
}
if (cd->total && switch_timestamp(NULL) >= cd->next) {
if (cd->index == MAX_CHIME || cd->index == cd->total || !cd->list[cd->index]) { if (cd->index == MAX_CHIME || cd->index == cd->total || !cd->list[cd->index]) {
cd->index = 0; cd->index = 0;
} }
...@@ -361,7 +365,7 @@ SWITCH_STANDARD_APP(fifo_function) ...@@ -361,7 +365,7 @@ SWITCH_STANDARD_APP(fifo_function)
arg_fifo_name = argv[0]; arg_fifo_name = argv[0];
arg_inout = argv[1]; arg_inout = argv[1];
if (!arg_fifo_name && arg_inout) { if (!(arg_fifo_name && arg_inout)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
return; return;
} }
...@@ -693,6 +697,7 @@ SWITCH_STANDARD_APP(fifo_function) ...@@ -693,6 +697,7 @@ SWITCH_STANDARD_APP(fifo_function)
} }
for (x = 0; x < custom_pop; x++) { for (x = 0; x < custom_pop; x++) {
switch_assert(pop_list[x]);
int temp = atoi(pop_list[x]); int temp = atoi(pop_list[x]);
if (temp > -1 && temp < MAX_PRI) { if (temp > -1 && temp < MAX_PRI) {
pop_array[x] = temp; pop_array[x] = temp;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论