X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/17ce15185fd5251a4fe8cec02950f0246d891e20..fe36a7ee2f4304fd3797443d4f2f950d6dc2475d:/sbr/base64.c

diff --git a/sbr/base64.c b/sbr/base64.c
index 7ceb27b9..3a578c21 100644
--- 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);