From d01588f37eb7cadc6d96bdd4a54cfda804dce4e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Sun, 26 Sep 2010 14:29:44 +0200 Subject: [PATCH 1/2] gsocket: Don't bother updating select mask if socket is closed --- gio/gsocket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gio/gsocket.c b/gio/gsocket.c index 5d8ecfb9c..e128c91b8 100644 --- a/gio/gsocket.c +++ b/gio/gsocket.c @@ -3790,6 +3790,9 @@ update_select_events (GSocket *socket) GList *l; WSAEVENT event; + if (socket->priv->closed) + return; + ensure_event (socket); event_mask = 0; From 17c53b5f162dab2b4be76adb6bbd432c266791d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Sun, 26 Sep 2010 15:06:25 +0200 Subject: [PATCH 2/2] gsocket: Don't call WSAEnumNetworkEvents if socket is closed Makes Application Verifier happy. --- gio/gsocket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gio/gsocket.c b/gio/gsocket.c index e128c91b8..e71315d17 100644 --- a/gio/gsocket.c +++ b/gio/gsocket.c @@ -3851,7 +3851,8 @@ update_condition_unlocked (GSocket *socket) WSANETWORKEVENTS events; GIOCondition condition; - if (WSAEnumNetworkEvents (socket->priv->fd, + if (!socket->priv->closed && + WSAEnumNetworkEvents (socket->priv->fd, socket->priv->event, &events) == 0) {