From: Wilfried Goesgens <dothebart@citadel.org>
Date: Thu, 2 Jan 2014 23:41:06 +0000 (+0100)
Subject: BASE64: - By Edward Flick - 0-terminate the transcoded buffer
X-Git-Tag: v9.01~150
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=77686f3e3c7b3a87e7bcf911601f1707ab0c0110

BASE64: - By Edward Flick - 0-terminate the transcoded buffer
---

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;
 }