Commit 14892c1d authored by John Ehresman's avatar John Ehresman Committed by John Ehresman

glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free) Initialize

2004-07-01  John Ehresman  <jpe@wingide.com>

	* glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free)
	Initialize reset_send & reset_recv fields and don't close
	sockets unless they were created.  (#145153)
parent ef9a178b
2004-07-01 John Ehresman <jpe@wingide.com>
* glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free)
Initialize reset_send & reset_recv fields and don't close
sockets unless they were created. (#145153)
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
......
2004-07-01 John Ehresman <jpe@wingide.com>
* glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free)
Initialize reset_send & reset_recv fields and don't close
sockets unless they were created. (#145153)
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
......
2004-07-01 John Ehresman <jpe@wingide.com>
* glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free)
Initialize reset_send & reset_recv fields and don't close
sockets unless they were created. (#145153)
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
......
2004-07-01 John Ehresman <jpe@wingide.com>
* glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free)
Initialize reset_send & reset_recv fields and don't close
sockets unless they were created. (#145153)
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
......
2004-07-01 John Ehresman <jpe@wingide.com>
* glib/giowin32.c (g_io_channel_win32_init, g_io_win32_free)
Initialize reset_send & reset_recv fields and don't close
sockets unless they were created. (#145153)
Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de>
* glib/gscanner.c (g_scanner_get_token_ll): Ignore a
......
......@@ -183,6 +183,8 @@ g_io_channel_win32_init (GIOWin32Channel *channel)
channel->data_avail_event = NULL;
channel->revents = 0;
channel->space_avail_event = NULL;
channel->reset_send = INVALID_SOCKET;
channel->reset_recv = INVALID_SOCKET;
channel->data_avail_noticed_event = NULL;
channel->watches = NULL;
InitializeCriticalSection (&channel->mutex);
......@@ -861,9 +863,9 @@ g_io_win32_free (GIOChannel *channel)
win32_channel->thread_id,
win32_channel->fd);
if (win32_channel->reset_send)
if (win32_channel->reset_send && win32_channel->reset_send != INVALID_SOCKET)
closesocket (win32_channel->reset_send);
if (win32_channel->reset_recv)
if (win32_channel->reset_recv && win32_channel->reset_recv != INVALID_SOCKET)
closesocket (win32_channel->reset_recv);
if (win32_channel->data_avail_event)
CloseHandle (win32_channel->data_avail_event);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment