提交 76f7bf6f authored 作者: Anthony Minessale's avatar Anthony Minessale

fix for FSCORE-51 (maybe)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5749 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 391a1f30
...@@ -360,7 +360,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *cha ...@@ -360,7 +360,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *cha
{ {
assert(channel != NULL); assert(channel != NULL);
switch_mutex_lock(channel->profile_mutex); switch_mutex_lock(channel->profile_mutex);
switch_core_hash_insert_dup(channel->private_hash, switch_core_session_strdup(channel->session, key), private_info); switch_core_hash_insert_dup_locked(channel->private_hash, switch_core_session_strdup(channel->session, key), private_info, channel->flag_mutex);
switch_mutex_unlock(channel->profile_mutex); switch_mutex_unlock(channel->profile_mutex);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
...@@ -400,11 +400,12 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_variable(switch_channel_t *ch ...@@ -400,11 +400,12 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_variable(switch_channel_t *ch
if (varname) { if (varname) {
switch_mutex_lock(channel->profile_mutex); switch_mutex_lock(channel->profile_mutex);
switch_core_hash_delete(channel->variables, varname); switch_core_hash_delete_locked(channel->variables, varname, channel->flag_mutex);
if (!switch_strlen_zero(value)) { if (!switch_strlen_zero(value)) {
switch_core_hash_insert_dup(channel->variables, varname, switch_clean_string(switch_core_session_strdup(channel->session, value))); switch_core_hash_insert_dup_locked(channel->variables, varname,
switch_clean_string(switch_core_session_strdup(channel->session, value)), channel->flag_mutex);
} else { } else {
switch_core_hash_delete(channel->variables, varname); switch_core_hash_delete_locked(channel->variables, varname, channel->flag_mutex);
} }
switch_mutex_unlock(channel->profile_mutex); switch_mutex_unlock(channel->profile_mutex);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
...@@ -419,11 +420,11 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_nodup(switch_channel ...@@ -419,11 +420,11 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_nodup(switch_channel
if (varname) { if (varname) {
switch_mutex_lock(channel->profile_mutex); switch_mutex_lock(channel->profile_mutex);
switch_core_hash_delete(channel->variables, varname); switch_core_hash_delete_locked(channel->variables, varname, channel->flag_mutex);
if (!switch_strlen_zero(value)) { if (!switch_strlen_zero(value)) {
switch_core_hash_insert_dup(channel->variables, varname, value); switch_core_hash_insert_dup_locked(channel->variables, varname, value, channel->flag_mutex);
} else { } else {
switch_core_hash_delete(channel->variables, varname); switch_core_hash_delete_locked(channel->variables, varname, channel->flag_mutex);
} }
switch_mutex_unlock(channel->profile_mutex); switch_mutex_unlock(channel->profile_mutex);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论