Merge 51eab5cfe8 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/mod/endpoints/mod_sofia/sofia.c

@@ -8503,7 +8503,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 			/* sdp changed since 18X w sdp, we're supposed to ignore it but we, of course, were pressured into supporting it */
 			uint8_t match = 0;
 
-			sofia_clear_flag(tech_pvt, TFLAG_NEW_SDP);
+
 			switch_channel_set_flag(tech_pvt->channel, CF_REINVITE);
 
 
@@ -8531,6 +8531,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 
 			}
 		}
+		sofia_clear_flag(tech_pvt, TFLAG_NEW_SDP);
 
 		if (r_sdp && sofia_test_flag(tech_pvt, TFLAG_NOSDP_REINVITE)) {
 			sofia_clear_flag_locked(tech_pvt, TFLAG_NOSDP_REINVITE);