提交 8b3bc7d7 authored 作者: Chris Rienzo's avatar Chris Rienzo

Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable

...@@ -1637,7 +1637,6 @@ static void *SWITCH_THREAD_FUNC o_thread_run(switch_thread_t *thread, void *obj) ...@@ -1637,7 +1637,6 @@ static void *SWITCH_THREAD_FUNC o_thread_run(switch_thread_t *thread, void *obj)
fifo_execute_sql_queued(&sql, SWITCH_TRUE, SWITCH_TRUE); fifo_execute_sql_queued(&sql, SWITCH_TRUE, SWITCH_TRUE);
status = switch_ivr_originate(NULL, &session, &cause, originate_string, h->timeout, NULL, NULL, NULL, NULL, ovars, SOF_NONE, NULL); status = switch_ivr_originate(NULL, &session, &cause, originate_string, h->timeout, NULL, NULL, NULL, NULL, ovars, SOF_NONE, NULL);
free(originate_string);
if (status != SWITCH_STATUS_SUCCESS) { if (status != SWITCH_STATUS_SUCCESS) {
...@@ -1694,6 +1693,10 @@ static void *SWITCH_THREAD_FUNC o_thread_run(switch_thread_t *thread, void *obj) ...@@ -1694,6 +1693,10 @@ static void *SWITCH_THREAD_FUNC o_thread_run(switch_thread_t *thread, void *obj)
end: end:
if ( originate_string ){
switch_safe_free(originate_string);
}
switch_event_destroy(&ovars); switch_event_destroy(&ovars);
if (node) { if (node) {
switch_mutex_lock(node->update_mutex); switch_mutex_lock(node->update_mutex);
......
...@@ -2343,7 +2343,7 @@ static char *load_cache_data(http_file_context_t *context, const char *url) ...@@ -2343,7 +2343,7 @@ static char *load_cache_data(http_file_context_t *context, const char *url)
if ((p = strchr(dext, '?'))) { if ((p = strchr(dext, '?'))) {
*p = '\0'; *p = '\0';
ext = dext; ext = dext;
} else free(dext); } else switch_safe_free(dext);
} }
context->cache_file_base = switch_core_sprintf(context->pool, "%s%s%s", globals.cache_path, SWITCH_PATH_SEPARATOR, digest); context->cache_file_base = switch_core_sprintf(context->pool, "%s%s%s", globals.cache_path, SWITCH_PATH_SEPARATOR, digest);
......
...@@ -8948,6 +8948,10 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia ...@@ -8948,6 +8948,10 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
switch_assert(sql); switch_assert(sql);
sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE); sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE);
if ( full_contact ) {
su_free(nua_handle_home(tech_pvt->nh), full_contact);
}
} }
if (is_nat) { if (is_nat) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论