diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | smtp.c | 16 | ||||
| -rw-r--r-- | transact.c | 10 |
3 files changed, 17 insertions, 12 deletions
@@ -65,6 +65,9 @@ fetchmail-6.3.20 (not yet released): variants are too diverse, and we've been bitten before -- and configure complains noisily on Cyrus-SASL's RFC1321 md5.h. +# BUG FIXES +* Call strlen() only once when removing CRLF from a line. (Sunil Shetye) + # TRANSLATION UPDATES [ja] Japanese (Takeshi Hamasaki) @@ -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++) @@ -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; |