Fix giving bad RWhandler args (mboen <boening.pad@sni.de>)

diff --git a/src/ssl.cc b/src/ssl.cc
index f6775cd0e3935878bfa6d03c66f669d6218742e0..e46313cf6412c0a6a15d6a3a42b409550bf4e607 100644 (file)
--- a/src/ssl.cc
+++ b/src/ssl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl.cc,v 1.31 1996/12/17 07:16:57 wessels Exp $
+ * $Id: ssl.cc,v 1.32 1997/01/21 16:42:04 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -308,6 +308,10 @@ static void
 sslErrorComplete(int fd, char *buf, int size, int errflag, void *sslState)
 {
     safe_free(buf);
+    if (sslState == NULL) {
+       debug_trap("sslErrorComplete: NULL sslState\n");
+       return;
+    }
     sslClose(sslState);
 }
 
@@ -416,12 +420,12 @@ sslStart(int fd, const char *url, request_t * request, char *mime_hdr, int *size
            fd_table[fd].ipaddr,
            500,
            xstrerror());
-       comm_write(sslState->client.fd,
+       comm_write(fd,
            xstrdup(buf),
            strlen(buf),
            30,
-           sslErrorComplete,
-           (void *) sslState,
+           NULL,
+           NULL,
            xfree);
        return COMM_ERROR;
     }

diff --git a/src/tunnel.cc b/src/tunnel.cc
index c9b7f4d76a3164bc9db18590c88ef8400445a61b..b52cd51f059e717d77e61fb55548a6f1caf93fe0 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tunnel.cc,v 1.31 1996/12/17 07:16:57 wessels Exp $
+ * $Id: tunnel.cc,v 1.32 1997/01/21 16:42:04 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -308,6 +308,10 @@ static void
 sslErrorComplete(int fd, char *buf, int size, int errflag, void *sslState)
 {
     safe_free(buf);
+    if (sslState == NULL) {
+       debug_trap("sslErrorComplete: NULL sslState\n");
+       return;
+    }
     sslClose(sslState);
 }
 
@@ -416,12 +420,12 @@ sslStart(int fd, const char *url, request_t * request, char *mime_hdr, int *size
            fd_table[fd].ipaddr,
            500,
            xstrerror());
-       comm_write(sslState->client.fd,
+       comm_write(fd,
            xstrdup(buf),
            strlen(buf),
            30,
-           sslErrorComplete,
-           (void *) sslState,
+           NULL,
+           NULL,
            xfree);
        return COMM_ERROR;
     }