Call strlen() only once when removing CRLF from a line

1 files changed, 6 insertions, 4 deletions

diff --git a/transact.c b/transact.c
index 55d25168..758e5aaf 100644
--- a/transact.c
+++ b/transact.c
@@ -1554,6 +1554,7 @@ int gen_recv(int sock  /** socket to which server is connected */,
 	     char *buf /* buffer to receive input */,
 	     int size  /* length of buffer */)
 {
+    size_t n;
     int oldphase = phase;	/* we don't have to be re-entrant */
 
     phase = SERVER_WAIT;
@@ -1573,10 +1574,11 @@ int gen_recv(int sock  /** socket to which server is connected */,
     else
     {
 	set_timeout(0);
-	if (buf[strlen(buf)-1] == '\n')
-	    buf[strlen(buf)-1] = '\0';
-	if (buf[strlen(buf)-1] == '\r')
-	    buf[strlen(buf)-1] = '\0';
+	n = strlen(buf);
+	if (n > 0 && buf[n-1] == '\n')
+	    buf[--n] = '\0';
+	if (n > 0 && buf[n-1] == '\r')
+	    buf[--n] = '\0';
 	if (outlevel >= O_MONITOR)
 	    report(stdout, "%s< %s\n", protocol->name, buf);
 	phase = oldphase;