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

prevent obscure divide by zero code path

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15413 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 ebe4bebf
......@@ -1158,7 +1158,7 @@ static switch_status_t create_file(switch_core_session_t *session, vm_profile_t
got_file = 1;
}
if (limit && (*message_len = fh.samples_out / fh.samplerate) < profile->min_record_len) {
if (limit && (*message_len = fh.samples_out / fh.samplerate ? fh.samplerate : 8000) < profile->min_record_len) {
if (unlink(file_path) != 0) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Failed to delete file [%s]\n", file_path);
}
......
......@@ -52,6 +52,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_perform_file_open(const char *file,
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Handle already open\n");
return SWITCH_STATUS_FALSE;
}
if (!fh->samplerate) {
if (!(fh->samplerate = rate)) {
fh->samplerate = 8000;
}
}
if (zstr(file_path)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Filename\n");
......@@ -135,12 +141,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_perform_file_open(const char *file,
fh->handler = switch_core_strdup(fh->memory_pool, rhs);
}
if (!fh->samplerate) {
if (!(fh->samplerate = rate)) {
fh->samplerate = 8000;
}
}
if (channels) {
fh->channels = channels;
} else {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论