From: wessels <>
Date: Tue, 21 Jan 1997 23:42:04 +0000 (+0000)
Subject: Fix giving bad RWhandler args (mboen <boening.pad@sni.de>)
X-Git-Tag: SQUID_3_0_PRE1~5181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2186d328d894623084703444dc319b41abf0bbb;p=thirdparty%2Fsquid.git

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

diff --git a/src/ssl.cc b/src/ssl.cc
index f6775cd0e3..e46313cf64 100644
--- 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 c9b7f4d76a..b52cd51f05 100644
--- 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;
     }