Merge 9c782d2d7b into 5e82e4f305

[esl] 1227669 Resource leak

libs/esl/src/esl.c

@@ -990,6 +990,8 @@ ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *
 	}
 
 	memcpy(&handle->sockaddr, result->ai_addr, result->ai_addrlen);	
+	freeaddrinfo(result);
+
 	switch(handle->sockaddr.ss_family) {
 		case AF_INET:
 			sockaddr_in = (struct sockaddr_in*)&(handle->sockaddr);
@@ -1005,7 +1007,6 @@ ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *
 			strncpy(handle->err, "Host resolves to unsupported address family", sizeof(handle->err));
 			goto fail;
 	}
-	freeaddrinfo(result);
 	
 	handle->sock = socket(handle->sockaddr.ss_family, SOCK_STREAM, IPPROTO_TCP);
 	

src/switch_channel.c

@@ -3765,9 +3765,9 @@ SWITCH_DECLARE(switch_status_t) switch_channel_execute_on_value(switch_channel_t
 	}
 	
 	if (bg) {
-		status = switch_core_session_execute_application_async(channel->session, app, arg);
+		status = switch_core_session_execute_application_async(channel->session, app, expanded);
 	} else {
-		status = switch_core_session_execute_application(channel->session, app, arg);
+		status = switch_core_session_execute_application(channel->session, app, expanded);
 	}
 
 	if (expanded && expanded != arg) {