zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-16 23:22:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix segfault generated by SSL disconnections. (Bug #752)

Browse source 
git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@5170 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Jase Thew 2010-05-16 17:50:31 +00:00 • committed by bazerka
commit ec83dd762a
2 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/network-openssl.c
View file

@ -247,6 +247,7 @@ static GIOStatus irssi_ssl_read(GIOChannel *handle, gchar *buf, gsize len, gsize
GIOSSLChannel *chan = (GIOSSLChannel *)handle;
gint ret1, err;
const char *errstr;
gchar *errmsg;
ret1 = SSL_read(chan->ssl, buf, len);
if(ret1 <= 0)
@ -271,9 +272,10 @@ static GIOStatus irssi_ssl_read(GIOChannel *handle, gchar *buf, gsize len, gsize
if (errstr == NULL)
errstr = "unknown SSL error";
}
g_warning("SSL read error: %s", errstr);
errmsg = g_strdup_printf("SSL read error: %s", errstr);
*gerr = g_error_new_literal(G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR_FAILED,
errstr);
errmsg);
g_free(errmsg);
return G_IO_STATUS_ERROR;
}
else
@ -290,6 +292,7 @@ static GIOStatus irssi_ssl_write(GIOChannel *handle, const gchar *buf, gsize len
GIOSSLChannel *chan = (GIOSSLChannel *)handle;
gint ret1, err;
const char *errstr;
gchar *errmsg;
ret1 = SSL_write(chan->ssl, (const char *)buf, len);
if(ret1 <= 0)
@ -314,9 +317,10 @@ static GIOStatus irssi_ssl_write(GIOChannel *handle, const gchar *buf, gsize len
if (errstr == NULL)
errstr = "unknown SSL error";
}
g_warning("SSL write error: %s", errstr);
errmsg = g_strdup_printf("SSL write error: %s", errstr);
*gerr = g_error_new_literal(G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR_FAILED,
errstr);
errmsg);
g_free(errmsg);
return G_IO_STATUS_ERROR;
}
else