test mhlogin -browser

[nmh] / sbr / base64.c

diff --git a/sbr/base64.c b/sbr/base64.c
index 7ceb27b95759651d6bd36732d60904bb3150674d..3a578c21bd2794faeb8bdd570859014788505a08 100644 (file)
--- a/sbr/base64.c
+++ b/sbr/base64.c
@@ -48,7 +48,15 @@ writeBase64aux (FILE *in, FILE *out, int crlf)
                     * everything down and push the last character back.
                     */
                    if (i == cc - 1) {
-                       ungetc('\n', in);
+                       /*
+                        * If we're at the end of the input, there might be
+                        * more room in inbuf; if so, add it there.  Otherwise
+                        * push it back to the input.
+                        */
+                       if (cc < sizeof(inbuf))
+                           inbuf[cc++] = '\n';
+                       else
+                           ungetc('\n', in);
                        skipnl = 1;
                    } else {
                        /* This only works as long as sizeof(inbuf) == 3 */
@@ -75,7 +83,10 @@ writeBase64aux (FILE *in, FILE *out, int crlf)
                outbuf[2] = '=';
        }
 
-       fwrite (outbuf, sizeof(*outbuf), sizeof(outbuf), out);
+       if (fwrite (outbuf, sizeof(*outbuf), sizeof(outbuf), out) <
+            sizeof outbuf) {
+           advise ("writeBase64aux", "fwrite");
+       }
 
        if (cc < sizeof(inbuf)) {
            putc ('\n', out);