From 0d59e634c26d57b37b17c78ae75e74938d2292bf Mon Sep 17 00:00:00 2001
From: "julien.pierre.bugs%sun.com" <devnull@localhost>
Date: Sat, 26 Feb 2005 04:57:32 +0000
Subject: Fix for bug 283761 - use of memset in selfserv is inefficient.
 r=nelson

---
 security/nss/cmd/selfserv/selfserv.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'security/nss')

diff --git a/security/nss/cmd/selfserv/selfserv.c b/security/nss/cmd/selfserv/selfserv.c
index 7bb93cbbc..458da225d 100644
--- a/security/nss/cmd/selfserv/selfserv.c
+++ b/security/nss/cmd/selfserv/selfserv.c
@@ -847,7 +847,6 @@ handle_connection(
 
     pBuf   = buf;
     bufRem = sizeof buf;
-    memset(buf, 0, sizeof buf);
 
     VLOG(("selfserv: handle_connection: starting"));
     opt.option             = PR_SockOpt_Nonblocking;
@@ -887,7 +886,7 @@ handle_connection(
     while (1) {
 	newln = 0;
 	reqLen     = 0;
-	rv = PR_Read(ssl_sock, pBuf, bufRem);
+	rv = PR_Read(ssl_sock, pBuf, bufRem - 1);
 	if (rv == 0 || 
 	    (rv < 0 && PR_END_OF_FILE_ERROR == PR_GetError())) {
 	    if (verbose)
@@ -898,6 +897,8 @@ handle_connection(
 	    errWarn("HDX PR_Read");
 	    goto cleanup;
 	}
+	/* NULL termination */
+	pBuf[rv] = 0;
 	if (firstTime) {
 	    firstTime = 0;
 	    printSecurityInfo(ssl_sock);
-- 
cgit v1.2.1