We _can_ have handle_throttle() called on defunct handles after all,

[sgt/putty] / windows / winhandl.c

diff --git a/windows/winhandl.c b/windows/winhandl.c
index d220e64..e45eb9b 100644 (file)
--- a/windows/winhandl.c
+++ b/windows/winhandl.c
@@ -122,7 +122,8 @@ static DWORD WINAPI handle_input_threadfunc(void *param)
  */
 static void handle_throttle(struct handle_input *ctx, int backlog)
 {
-    assert(!ctx->defunct);
+    if (ctx->defunct)
+       return;
 
     /*
      * If there's a read operation already in progress, do nothing:
@@ -273,7 +274,6 @@ struct handle *handle_input_new(HANDLE handle, handle_inputfn_t gotdata,
     h->u.i.ev_to_main = CreateEvent(NULL, FALSE, FALSE, NULL);
     h->u.i.ev_from_main = CreateEvent(NULL, FALSE, FALSE, NULL);
     h->u.i.gotdata = gotdata;
-    h->u.i.busy = FALSE;
     h->u.i.defunct = FALSE;
     h->u.i.moribund = FALSE;
     h->u.i.done = FALSE;
@@ -285,8 +285,7 @@ struct handle *handle_input_new(HANDLE handle, handle_inputfn_t gotdata,
 
     CreateThread(NULL, 0, handle_input_threadfunc,
                 &h->u.i, 0, NULL);
-
-    handle_throttle(&h->u.i, 0);       /* start first read operation */
+    h->u.i.busy = TRUE;
 
     return h;
 }
@@ -393,6 +392,7 @@ void handle_free(struct handle *h)
         */
        h->u.g.moribund = TRUE;
        h->u.g.done = TRUE;
+       h->u.g.busy = TRUE;
        SetEvent(h->u.g.ev_from_main);
     }
 }
@@ -426,6 +426,7 @@ void handle_got_event(HANDLE event)
            handle_destroy(h);
        } else {
            h->u.g.done = TRUE;
+           h->u.g.busy = TRUE;
            SetEvent(h->u.g.ev_from_main);
        }
        return;