From: Anthony Minessale Date: Tue, 15 Nov 2011 13:55:31 +0000 (-0600) Subject: fix regression from e52e44e39ceb37a70c9550adf1f0c4130a299f2f probably keeping the... X-Git-Tag: v1.2-rc1~27^2~181 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adfbee993edba4a4bc49fdc6a4ea8158b5c1b70a;p=thirdparty%2Ffreeswitch.git fix regression from e52e44e39ceb37a70c9550adf1f0c4130a299f2f probably keeping the user channel from propigating variables into the real channel --- diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c index 98517d4b40..1857d1997d 100755 --- a/src/mod/applications/mod_dptools/mod_dptools.c +++ b/src/mod/applications/mod_dptools/mod_dptools.c @@ -3161,7 +3161,7 @@ static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session, switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags, switch_call_cause_t *cancel_cause) { - switch_xml_t xml = NULL, x_user = NULL, x_param, x_params; + switch_xml_t x_user = NULL, x_param, x_params; char *user = NULL, *domain = NULL, *dup_domain = NULL; const char *dest = NULL; switch_call_cause_t cause = SWITCH_CAUSE_NONE; @@ -3326,8 +3326,8 @@ static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session, switch_safe_free(d_dest); } } - - if (new_channel && xml) { + + if (new_channel && x_user) { if ((x_params = switch_xml_child(x_user, "variables"))) { for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) { const char *pvar = switch_xml_attr(x_param, "name"); @@ -3343,8 +3343,6 @@ static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session, switch_xml_free(x_user); } - switch_xml_free(xml); - if (params) { switch_event_destroy(¶ms); }