aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-01-03 14:56:47 -05:00
Code

Merge pull request #1298 from ailin-nemui/connect-crashes

Browse Source 
fix crash on /connect -tls
This commit is contained in:
ailin-nemui 2021-04-08 15:46:18 +02:00 committed by GitHub
commit 9b02424f30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/servers.c
View File

@ -208,7 +208,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
const char *errmsg;
char *errmsg2;
char ipaddr[MAX_IP_LEN];
int port;
int port = 0;
g_return_if_fail(ip != NULL || unix_socket != NULL);
@ -222,12 +222,22 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4;
port = server->connrec->proxy != NULL ?
server->connrec->proxy_port : server->connrec->port;
handle = server->connrec->use_tls ?
net_connect_ip_ssl(ip, port, own_ip, server) : net_connect_ip(ip, port, own_ip);
handle = net_connect_ip(ip, port, own_ip);
} else {
handle = net_connect_unix(unix_socket);
}
if (server->connrec->use_tls && handle != NULL) {
server->handle = net_sendbuffer_create(handle, 0);
handle = net_start_ssl(server);
if (handle == NULL) {
net_sendbuffer_destroy(server->handle, TRUE);
server->handle = NULL;
} else {
server->handle->handle = handle;
}
}
if (handle == NULL) {
/* failed */
errmsg = g_strerror(errno);
@ -244,12 +254,15 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
server->no_reconnect = TRUE;
server->connection_lost = TRUE;
server->connrec->last_failed_family = ip->family;
if (ip != NULL) {
server->connrec->last_failed_family = ip->family;
}
server_connect_failed(server, errmsg2 ? errmsg2 : errmsg);
g_free(errmsg2);
} else {
server->connrec->last_failed_family = 0;
server->handle = net_sendbuffer_create(handle, 0);
if (!server->connrec->use_tls)
server->handle = net_sendbuffer_create(handle, 0);
if (server->connrec->use_tls)
server_connect_callback_init_ssl(server, handle);
else