Merge 9f088b08eb into 5e82e4f305

Merge pull request #2755 from signalwire/eslleak
[esl] 1227669 Resource leak
2025-01-31 16:49:26 +00:00 · 2025-01-31 18:36:53 +03:00 · 2025-01-31 18:09:18 +03:00 · 2024-06-25 10:11:53 +01:00
2 changed files with 7 additions and 1 deletions
--- a/libs/esl/src/esl.c
+++ b/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);
 	
--- a/src/switch_core_media_bug.c
+++ b/src/switch_core_media_bug.c
@ -678,6 +678,11 @@ static void *SWITCH_THREAD_FUNC video_bug_thread(switch_thread_t *thread, void *

 			if (switch_queue_trypop(other_q, &other_pop) == SWITCH_STATUS_SUCCESS) {
 				switch_img_free(&other_img);
+
+				if (!other_pop) {
+					goto end;
+				}
+
 				other_img = (switch_image_t *) other_pop;

 				if (IMG && !(other_last_w == other_img->d_w && other_last_h == other_img->d_h)) {
Author	SHA1	Message	Date
wmasilva	1a3560e89b	Merge `9f088b08eb` into `5e82e4f305`	2025-01-31 16:49:26 +00:00
Andrey Volk	5e82e4f305	Merge pull request #2755 from signalwire/eslleak [esl] 1227669 Resource leak	2025-01-31 18:36:53 +03:00
Andrey Volk	d895fdff60	[esl] 1227669 Resource leak	2025-01-31 18:09:18 +03:00
Antonio Silva	9f088b08eb	fix segfault on video_bug_thread when other_pop is empty	2024-06-25 10:11:53 +01:00