zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-11 21:00:40 +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

14
src/core/network.c
View file

@ -349,11 +349,16 @@ int net_receive(GIOChannel *handle, char *buf, int len)
{
gsize ret;
GIOStatus status;
GError *err = NULL;
g_return_val_if_fail(handle != NULL, -1);
g_return_val_if_fail(buf != NULL, -1);
status = g_io_channel_read_chars(handle, buf, len, &ret, NULL);
status = g_io_channel_read_chars(handle, buf, len, &ret, &err);
if (err != NULL) {
g_warning(err->message);
g_error_free(err);
}
if (status == G_IO_STATUS_ERROR || status == G_IO_STATUS_EOF)
return -1; /* disconnected */
@ -365,11 +370,16 @@ int net_transmit(GIOChannel *handle, const char *data, int len)
{
gsize ret;
GIOStatus status;
GError *err = NULL;
g_return_val_if_fail(handle != NULL, -1);
g_return_val_if_fail(data != NULL, -1);
status = g_io_channel_write_chars(handle, (char *) data, len, &ret, NULL);
status = g_io_channel_write_chars(handle, (char *) data, len, &ret, &err);
if (err != NULL) {
g_warning(err->message);
g_error_free(err);
}
if (status == G_IO_STATUS_ERROR)
return -1;