X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=smtp.c;h=1c99c69675917cbbda7c2e1f6ebf9e91faf8946c;hb=e75c62b234a699557c023970466a8accd0b5a7b2;hp=584f9ecef72cfe7c5efbd689dc31a6974a9896a6;hpb=8e4bfa7520c919ec2a7b00067c3348f0d1c73c8d;p=~andy%2Ffetchmail

diff --git a/smtp.c b/smtp.c
index 584f9ece..1c99c696 100644
--- a/smtp.c
+++ b/smtp.c
@@ -98,7 +98,7 @@ static void SMTP_auth(int sock, char smtp_mode, char *username, char *password,
 		if (outlevel >= O_DEBUG)
 			report(stdout, GT_("Challenge decoded: %s\n"), b64buf);
 		hmac_md5((unsigned char *)password, strlen(password),
-			 b64buf, strlen(b64buf), digest, sizeof(digest));
+			 (unsigned char *)b64buf, strlen(b64buf), digest, sizeof(digest));
 		snprintf(tmp, sizeof(tmp),
 		"%s %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
 		username,  digest[0], digest[1], digest[2], digest[3],
@@ -185,15 +185,16 @@ int SMTP_ehlo(int sock, char smtp_mode, const char *host, char *name, char *pass
   *opt = 0;
   while ((SockRead(sock, smtp_response, sizeof(smtp_response)-1)) != -1)
   {
-      int  n = strlen(smtp_response);
+      size_t n;
 
       set_timeout(0);
       (void)set_signal_handler(SIGALRM, alrmsave);
 
-      if (smtp_response[strlen(smtp_response)-1] == '\n')
-	  smtp_response[strlen(smtp_response)-1] = '\0';
-      if (smtp_response[strlen(smtp_response)-1] == '\r')
-	  smtp_response[strlen(smtp_response)-1] = '\0';
+      n = strlen(smtp_response);
+      if (n > 0 && smtp_response[n-1] == '\n')
+	  smtp_response[--n] = '\0';
+      if (n > 0 && smtp_response[n-1] == '\r')
+	  smtp_response[--n] = '\0';
       if (n < 4)
 	  return SM_ERROR;
       smtp_response[n] = '\0';
@@ -329,10 +330,9 @@ int SMTP_ok(int sock, char smtp_mode, int mintimeout)
 
 	n = strlen(reply);
 	if (n > 0 && reply[n-1] == '\n')
-	    n--;
+	    reply[--n] = '\0';
 	if (n > 0 && reply[n-1] == '\r')
-	    n--;
-	reply[n] = '\0';
+	    reply[--n] = '\0';
 
 	/* stomp over control characters */
 	for (i = reply; *i; i++)