Merge 5e3b08d95f 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_utils.c

@@ -1166,7 +1166,7 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
 		if (file) {
 			if ((ifd = open(file, O_RDONLY | O_BINARY)) < 0) {
 				rval = SWITCH_FALSE;
-				err = "Cannot open tmp file\n";
+				err = "Cannot open file\n";
 				goto end;
 			}
 		}
@@ -1284,6 +1284,10 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
 				goto end;
 			}
 		}
+	} else {
+		err = "cannot open tmp file\n";
+		rval = SWITCH_FALSE;
+		goto end;
 	}
 
 	if (fd > -1) {