Merge commit '8206fbf', due to my screwup of committing it on a detached

[nmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 2eb823cf91d095906b40b9fd9eef53833673e21f..15d03f0b3b4b1b79015a20d8179775c1fbab4891 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -89,12 +89,20 @@ static int putline (char *, FILE *);
  * layer.
  */
 
  * layer.
  */
 

+#define CHECKB64SIZE(insize, outbuf, outsize) \
+    { size_t wantout = (((insize + 2) / 3) * 4) + 32; \
+      if (wantout > outsize) { \
+          outbuf = mh_xrealloc(outbuf, outsize = wantout); \
+      } \
+    }
+

 int
 pop_auth_sasl(char *user, char *host, char *mech)
 {
     int result, status, sasl_capability = 0;
     unsigned int buflen, outlen;
 int
 pop_auth_sasl(char *user, char *host, char *mech)
 {
     int result, status, sasl_capability = 0;
     unsigned int buflen, outlen;

-    char server_mechs[256], *buf, outbuf[BUFSIZ];
+    char server_mechs[256], *buf, *outbuf = NULL;
+    size_t outbufsize = 0;

     const char *chosen_mech;
     sasl_security_properties_t secprops;
     struct pass_context p_context;
     const char *chosen_mech;
     sasl_security_properties_t secprops;
     struct pass_context p_context;


@@ -209,10 +217,13 @@ pop_auth_sasl(char *user, char *host, char *mech)
     }
 
     if (buflen) {
     }
 
     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) {
            snprintf(response, sizeof(response), "SASL base64 encode "
                     "failed: %s", sasl_errstring(status, NULL, NULL));
        if (status != SASL_OK) {
            snprintf(response, sizeof(response), "SASL base64 encode "
                     "failed: %s", sasl_errstring(status, NULL, NULL));

+           if (outbuf)
+               free(outbuf);

            return NOTOK;
        }
 
            return NOTOK;
        }
 


@@ -221,8 +232,13 @@ pop_auth_sasl(char *user, char *host, char *mech)
        status = command("AUTH %s", chosen_mech);
 
     while (result == SASL_CONTINUE) {
        status = command("AUTH %s", chosen_mech);
 
     while (result == SASL_CONTINUE) {

-       if (status == NOTOK)
+       size_t inlen;
+
+       if (status == NOTOK) {
+           if (outbuf)
+               free(outbuf);

            return NOTOK;
            return NOTOK;

+       }

        
        /*
         * If we get a "+OK" prefix to our response, then we should
        
        /*
         * If we get a "+OK" prefix to our response, then we should


@@ -241,16 +257,31 @@ pop_auth_sasl(char *user, char *host, char *mech)
            command("*");
            snprintf(response, sizeof(response),
                     "Malformed authentication message from server");
            command("*");
            snprintf(response, sizeof(response),
                     "Malformed authentication message from server");

+           if (outbuf)
+               free(outbuf);

            return NOTOK;
        }
 
            return NOTOK;
        }
 

+       /*
+        * For decode, it will always be shorter, so just make sure
+        * that outbuf is as at least as big as the encoded response.
+        */
+
+       inlen = strlen(response + 2);
+
+       if (inlen > outbufsize) {
+           outbuf = mh_xrealloc(outbuf, outbufsize = inlen);
+       }
+

        result = sasl_decode64(response + 2, strlen(response + 2),
        result = sasl_decode64(response + 2, strlen(response + 2),

-                              outbuf, sizeof(outbuf), &outlen);
+                              outbuf, outbufsize, &outlen);

        
        if (result != SASL_OK) {
            command("*");
            snprintf(response, sizeof(response), "SASL base64 decode "
                     "failed: %s", sasl_errstring(result, NULL, NULL));
        
        if (result != SASL_OK) {
            command("*");
            snprintf(response, sizeof(response), "SASL base64 decode "
                     "failed: %s", sasl_errstring(result, NULL, NULL));

+           if (outbuf)
+               free(outbuf);

            return NOTOK;
        }
 
            return NOTOK;
        }
 


@@ -261,21 +292,30 @@ pop_auth_sasl(char *user, char *host, char *mech)
            command("*");
            snprintf(response, sizeof(response), "SASL client negotiaton "
                     "failed: %s", sasl_errdetail(conn));
            command("*");
            snprintf(response, sizeof(response), "SASL client negotiaton "
                     "failed: %s", sasl_errdetail(conn));

+           if (outbuf)
+               free(outbuf);

            return NOTOK;
        }
 
            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) {
            command("*");
            snprintf(response, sizeof(response), "SASL base64 encode "
                     "failed: %s", sasl_errstring(status, NULL, NULL));
 
        if (status != SASL_OK) {
            command("*");
            snprintf(response, sizeof(response), "SASL base64 encode "
                     "failed: %s", sasl_errstring(status, NULL, NULL));

+           if (outbuf)
+               free(outbuf);

            return NOTOK;
        }
 
        status = command(outbuf);
     }
 
            return NOTOK;
        }
 
        status = command(outbuf);
     }
 

+    if (outbuf)
+       free(outbuf);
+

     /*
      * If we didn't get a positive final response, then error out
      * (that probably means we failed an authorization check).
     /*
      * If we didn't get a positive final response, then error out
      * (that probably means we failed an authorization check).


@@ -447,8 +487,12 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
        int inpipe[2];    /* for reading from the server */
        int outpipe[2];    /* for sending to the server */
 
        int inpipe[2];    /* for reading from the server */
        int outpipe[2];    /* for sending to the server */
 

-       pipe(inpipe);
-       pipe(outpipe);
+       if (pipe(inpipe) < 0) {
+          adios ("inpipe", "pipe");
+       }
+       if (pipe(outpipe) < 0) {
+          adios ("outpipe", "pipe");
+       }

 
        pid=fork();
        if (pid==0) {
 
        pid=fork();
        if (pid==0) {


@@ -753,9 +797,10 @@ command(const char *fmt, ...)
 static int
 vcommand (const char *fmt, va_list ap)
 {
 static int
 vcommand (const char *fmt, va_list ap)
 {

-    char *cp, buffer[BUFSIZ];
+    char *cp, buffer[65536];

 
     vsnprintf (buffer, sizeof(buffer), fmt, ap);
 
     vsnprintf (buffer, sizeof(buffer), fmt, ap);

+

     if (poprint) {
 #ifdef CYRUS_SASL
        if (sasl_ssf)
     if (poprint) {
 #ifdef CYRUS_SASL
        if (sasl_ssf)


@@ -854,7 +899,7 @@ sasl_getline (char *s, int n, FILE *iop)
     *p = 0;
     if (*--p == '\n')
        *p = 0;
     *p = 0;
     if (*--p == '\n')
        *p = 0;

-    if (*--p == '\r')
+    if (p > s  &&  *--p == '\r')

        *p = 0;
 
     return OK;
        *p = 0;
 
     return OK;


@@ -891,7 +936,9 @@ putline (char *s, FILE *iop)
            return NOTOK;
        }
 
            return NOTOK;
        }
 

-       fwrite(buf, buflen, 1, iop);
+       if (fwrite(buf, buflen, 1, iop) < 1) {
+           advise ("putline", "fwrite");
+       }

     }
 #endif /* CYRUS_SASL */
 
     }
 #endif /* CYRUS_SASL */