From f9b2295a6016753431874117a31b7b993dd3ad48 Mon Sep 17 00:00:00 2001
From: "nelsonb%netscape.com" <nelsonb%netscape.com>
Date: Thu, 28 Sep 2000 01:50:15 +0000
Subject: [PATCH] Fix crash when PR_Connect times out.

---
 security/nss/cmd/strsclnt/strsclnt.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/security/nss/cmd/strsclnt/strsclnt.c b/security/nss/cmd/strsclnt/strsclnt.c
index 059a0696e06..71ebf718b26 100644
--- a/security/nss/cmd/strsclnt/strsclnt.c
+++ b/security/nss/cmd/strsclnt/strsclnt.c
@@ -717,8 +717,8 @@ do_connects(
 {
     PRNetAddr  *        addr		= (PRNetAddr *)  a;
     PRFileDesc *        model_sock	= (PRFileDesc *) b;
-    PRFileDesc *        ssl_sock;
-    PRFileDesc *        tcp_sock;
+    PRFileDesc *        ssl_sock	= 0;
+    PRFileDesc *        tcp_sock	= 0;
     PRStatus	        prStatus;
     SECStatus   	result;
     int                 rv 		= SECSuccess;
@@ -748,6 +748,7 @@ retry:
 	    goto retry;
 	}
 	errWarn("PR_Connect");
+	rv = SECFailure;
 	goto done;
     }
 
@@ -771,7 +772,11 @@ retry:
     }
 
 done:
-    PR_Close(ssl_sock);
+    if (ssl_sock) {
+	PR_Close(ssl_sock);
+    } else if (tcp_sock) {
+	PR_Close(tcp_sock);
+    }
     return SECSuccess;
 }