X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flogger.c;h=6028e3d00cd008296724ab22ee97151e8f6204f1;hb=b1c29464b68d756035acc4b4d1681f05d8831eaf;hp=ad7cef280c3d95cb210fcfd8e54920baa29e38d1;hpb=19e0d449ebd06450c9d7f16f032c0806242c7515;p=tinc

diff --git a/src/logger.c b/src/logger.c
index ad7cef28..6028e3d0 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -110,23 +110,27 @@ void logger(int level, int priority, const char *format, ...) {
 
 	va_start(ap, format);
 	int len = vsnprintf(message, sizeof message, format, ap);
+	message[sizeof message - 1] = 0;
 	va_end(ap);
 
-	if(len > 0 && len < sizeof message && message[len - 1] == '\n')
+	if(len > 0 && len < sizeof message - 1 && message[len - 1] == '\n')
 		message[len - 1] = 0;
 
 	real_logger(level, priority, message);
 }
 
 static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap) {
-	char message[1024] = "";
+	char message[1024];
 	size_t msglen = sizeof message;
 
 	int len = vsnprintf(message, msglen, format, ap);
-	if(len > 0 && len < sizeof message) {
+	message[sizeof message - 1] = 0;
+	if(len > 0 && len < sizeof message - 1) {
 		if(message[len - 1] == '\n')
 			message[--len] = 0;
 
+		// WARNING: s->handle can point to a connection_t or a node_t,
+		// but both types have the name and hostname fields at the same offsets.
 		connection_t *c = s->handle;
 		if(c)
 			snprintf(message + len, sizeof message - len, " from %s (%s)", c->name, c->hostname);
@@ -208,6 +212,5 @@ void closelogger(void) {
 		case LOGMODE_NULL:
 		case LOGMODE_STDERR:
 			break;
-			break;
 	}
 }