X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Flib%2Ftools.c;fp=libcitadel%2Flib%2Ftools.c;h=fa8f1657db46ec35462622c77dcfca53ceb60eb4;hb=77686f3e3c7b3a87e7bcf911601f1707ab0c0110;hp=d5396191ac293650301d2c3b465a061a54daf077;hpb=4032a9c4c69d6bec1cf7ed922f869d76617487ae;p=citadel.git

diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index d5396191a..fa8f1657d 100644
--- a/libcitadel/lib/tools.c
+++ b/libcitadel/lib/tools.c
@@ -324,13 +324,14 @@ size_t CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen, int li
 			dest[destoffset++] = '\r';
 			dest[destoffset++] = '\n';
 		}
-		return destoffset;
-
-	} else {
+	}
+	else {
 		destoffset = base64_encode_block(source, sourcelen, dest, &_state);
 
-		return destoffset + base64_encode_blockend(&(dest[destoffset]), &_state);
+		destoffset += base64_encode_blockend(&(dest[destoffset]), &_state);
 	}
+	dest[destoffset] = 0;
+	return destoffset;
 }