Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed memory leak with ssl_con

Browse Source
This commit is contained in:
ritt 2019-12-09 17:01:19 +01:00
parent 993bed4923
commit d9d1f5b54b
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/elogd.c
View File

@ -2560,6 +2560,7 @@ int retrieve_url(LOGBOOK *lbs, const char *url, int ssl, char **buffer, BOOL sen
#ifdef HAVE_SSL
if (ssl)
if (ssl_connect(sock, &ssl_con) < 0) {
SSL_free(ssl_con);
printf("Error initiating SSL connection\n");
return -1;
}
@ -2634,6 +2635,11 @@ int retrieve_url(LOGBOOK *lbs, const char *url, int ssl, char **buffer, BOOL sen
} while (1);
#ifdef HAVE_SSL
if (ssl)
SSL_free(ssl_con);
#endif
return n;
}
@ -15761,6 +15767,7 @@ int submit_message(LOGBOOK *lbs, char *host, int message_id, char *error_str) {
if (ssl)
if (ssl_connect(sock, &ssl_con) < 0) {
strcpy(error_str, "Error initiating SSL connection\n");
SSL_free(ssl_con);
return -1;
}
#endif
@ -15894,7 +15901,6 @@ int submit_message(LOGBOOK *lbs, char *host, int message_id, char *error_str) {
send_with_timeout(ssl_con, sock, request, header_length);
send_with_timeout(ssl_con, sock, content, content_length);
#ifdef HAVE_SSL
if (ssl)
/* receive response */
@ -15909,6 +15915,10 @@ int submit_message(LOGBOOK *lbs, char *host, int message_id, char *error_str) {
closesocket(sock);
xfree(text);
strcpy(error_str, "Cannot receive response");
#ifdef HAVE_SSL
if (ssl)
SSL_free(ssl_con);
#endif
return -1;
}
@ -16198,6 +16208,10 @@ void submit_config(LOGBOOK *lbs, char *server, char *buffer, char *error_str) {
if (i < 0) {
closesocket(sock);
strlcpy(error_str, "Cannot receive response", 256);
#ifdef HAVE_SSL
if (ssl)
SSL_free(ssl_con);
#endif
return;
}