Patches to prevent a couple of silly crashes

[u/mdw/putty] / raw.c

diff --git a/raw.c b/raw.c
index 2abc0a8..e3d5c06 100644 (file)
--- a/raw.c
+++ b/raw.c
@@ -24,13 +24,15 @@ static void c_write (char *buf, int len) {
     from_backend(0, buf, len);
 }
 
-static int raw_receive (Socket s, int urgent, char *data, int len) {
+static int raw_receive (Socket skt, int urgent, char *data, int len) {
     if (urgent==3) {
         /* A socket error has occurred. */
+        sk_close(s);
+        s = NULL;
         connection_fatal(data);
         len = 0;
-    }
-    if (!len) {
+        return 0;
+    } else if (!len) {
        /* Connection has closed. */
        sk_close(s);
        s = NULL;
@@ -64,7 +66,7 @@ static char *raw_init (char *host, int port, char **realhost) {
     /*
      * Open socket.
      */
-    s = sk_new(addr, port, 0, raw_receive);
+    s = sk_new(addr, port, 0, 1, raw_receive);
     if ( (err = sk_socket_error(s)) )
        return err;