X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/68fbd79dd7baa8211c0b1854dc5e0d6acf186ddd..64f5cda4610fa3de39a9d69aeda2d8a26f147f2e:/mts/smtp/smtp.c?ds=inline

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index e6ac1661..873e0cd8 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -10,6 +10,7 @@
 #include "smtp.h"
 #include <h/mts.h>
 #include <h/signals.h>
+#include <h/utils.h>
 
 #ifdef CYRUS_SASL
 #include <sasl/sasl.h>
@@ -798,17 +799,26 @@ sm_end (int type)
  * completes successfully, then authentication is successful and we've
  * (optionally) negotiated a security layer.
  */
+
+#define CHECKB64SIZE(insize, outbuf, outsize) \
+    { size_t wantout = (((insize + 2) / 3) * 4) + 32; \
+      if (wantout > outsize) { \
+          outbuf = mh_xrealloc(outbuf, outsize = wantout); \
+      } \
+    }
+
 static int
 sm_auth_sasl(char *user, int saslssf, char *mechlist, char *inhost)
 {
     int result, status;
     unsigned int buflen, outlen;
-    char *buf, outbuf[BUFSIZ], host[NI_MAXHOST];
+    char *buf, *outbuf = NULL, host[NI_MAXHOST];
     const char *chosen_mech;
     sasl_security_properties_t secprops;
     sasl_ssf_t *ssf;
     int *outbufmax;
     struct nmh_creds creds = { 0, 0, 0 };
+    size_t outbufsize = 0;
 
     /*
      * Initialize the callback contexts
@@ -905,10 +915,13 @@ sm_auth_sasl(char *user, int saslssf, char *mechlist, char *inhost)
      */
 
     if (buflen) {
-	status = sasl_encode64(buf, buflen, outbuf, sizeof(outbuf), NULL);
+	CHECKB64SIZE(buflen, outbuf, outbufsize);
+	status = sasl_encode64(buf, buflen, outbuf, outbufsize, NULL);
 	if (status != SASL_OK) {
 	    sm_ierror("SASL base64 encode failed: %s",
 		      sasl_errstring(status, NULL, NULL));
+	    if (outbuf)
+		free(outbuf);
 	    return NOTOK;
 	}
 
@@ -935,8 +948,11 @@ sm_auth_sasl(char *user, int saslssf, char *mechlist, char *inhost)
 
 	if (status == 235)
 	    break;
-	else if (status < 300 || status > 399)
+	else if (status < 300 || status > 399) {
+	    if (outbuf)
+		free(outbuf);
 	    return RP_BHST;
+	}
 	
 	/*
 	 * Special case; a zero-length response from the SMTP server
@@ -947,12 +963,18 @@ sm_auth_sasl(char *user, int saslssf, char *mechlist, char *inhost)
 	if (strcmp("=", sm_reply.text) == 0) {
 	    outlen = 0;
 	} else {
+	    if (sm_reply.length > (int) outbufsize) {
+		outbuf = mh_xrealloc(outbuf, outbufsize = sm_reply.length);
+	    }
+
 	    result = sasl_decode64(sm_reply.text, sm_reply.length,
-				   outbuf, sizeof(outbuf), &outlen);
+				   outbuf, outbufsize, &outlen);
 	    if (result != SASL_OK) {
 		smtalk(SM_AUTH, "*");
 		sm_ierror("SASL base64 decode failed: %s",
 			  sasl_errstring(result, NULL, NULL));
+		if (outbuf)
+		    free(outbuf);
 		return NOTOK;
 	    }
 	}
@@ -964,21 +986,29 @@ sm_auth_sasl(char *user, int saslssf, char *mechlist, char *inhost)
 	    smtalk(SM_AUTH, "*");
 	    sm_ierror("SASL client negotiation failed: %s",
 		      sasl_errstring(result, NULL, NULL));
+	    if (outbuf)
+		free(outbuf);
 	    return NOTOK;
 	}
 
-	status = sasl_encode64(buf, buflen, outbuf, sizeof(outbuf), NULL);
+	CHECKB64SIZE(buflen, outbuf, outbufsize);
+	status = sasl_encode64(buf, buflen, outbuf, outbufsize, NULL);
 
 	if (status != SASL_OK) {
 	    smtalk(SM_AUTH, "*");
 	    sm_ierror("SASL base64 encode failed: %s",
 		      sasl_errstring(status, NULL, NULL));
+	    if (outbuf)
+		free(outbuf);
 	    return NOTOK;
 	}
 	
 	status = smtalk(SM_AUTH, outbuf);
     }
 
+    if (outbuf)
+	free(outbuf);
+
     /*
      * Make sure that we got the correct response
      */
@@ -1122,12 +1152,22 @@ smtalk (int time, char *fmt, ...)
 {
     va_list ap;
     int result;
-    char buffer[BUFSIZ];
+    char *buffer;
+    size_t bufsize = BUFSIZ;
+
+    buffer = mh_xmalloc(bufsize);
 
     va_start(ap, fmt);
-    vsnprintf (buffer, sizeof(buffer), fmt, ap);
+    result = vsnprintf (buffer, bufsize, fmt, ap);
     va_end(ap);
 
+    if (result > (int) bufsize) {
+	buffer = mh_xrealloc(buffer, bufsize = result + 1);
+	va_start(ap, fmt);
+	vsnprintf (buffer, bufsize, fmt, ap);
+	va_end(ap);
+    }
+
     if (sm_debug) {
 	if (sasl_ssf)
 		printf("(sasl-encrypted) ");
@@ -1143,6 +1183,8 @@ smtalk (int time, char *fmt, ...)
 	result = smhear ();
     alarm (0);
 
+    free(buffer);
+
     return result;
 }
 
@@ -1181,7 +1223,7 @@ sm_wstream (char *buffer, int len)
 	return (ferror (sm_wfp) ? sm_werror () : OK);
     }
 
-    for (bp = buffer; len > 0; bp++, len--) {
+    for (bp = buffer; bp && len > 0; bp++, len--) {
 	switch (*bp) {
 	    case '\n': 
 		sm_nl = TRUE;
@@ -1230,7 +1272,9 @@ sm_fwrite(char *buffer, int len)
 	    }
 	} else
 #endif /* TLS_SUPPORT */
-	fwrite(buffer, sizeof(*buffer), len, sm_wfp);
+	if ((int) fwrite(buffer, sizeof(*buffer), len, sm_wfp) < len) {
+	    advise ("sm_fwrite", "fwrite");
+	}
 #ifdef CYRUS_SASL
     } else {
 	while (len >= maxoutbuf - sasl_outbuflen) {
@@ -1246,7 +1290,10 @@ sm_fwrite(char *buffer, int len)
 		return NOTOK;
 	    }
 
-	    fwrite(output, sizeof(*output), outputlen, sm_wfp);
+	    if (fwrite(output, sizeof(*output), outputlen, sm_wfp) <
+		outputlen) {
+		advise ("sm_fwrite", "fwrite");
+	    }
 	}
 
 	if (len > 0) {
@@ -1393,7 +1440,9 @@ sm_fflush(void)
 	    return;
 	}
 
-	fwrite(output, sizeof(*output), outputlen, sm_wfp);
+	if (fwrite(output, sizeof(*output), outputlen, sm_wfp) < outputlen) {
+	    advise ("sm_fflush", "fwrite");
+	}
 	sasl_outbuflen = 0;
     }
 #endif /* CYRUS_SASL */
@@ -1425,7 +1474,7 @@ smhear (void)
     int i, code, cont, bc = 0, rc, more;
     unsigned char *bp;
     char *rp;
-    char **ehlo = NULL, buffer[BUFSIZ];
+    char **ehlo = EHLOkeys, buffer[BUFSIZ];
 
     if (doingEHLO) {
 	static int at_least_once = 0;