From 2b4be4b7cf4fa5929d5982dbba6c73324c39ca7d Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Thu, 10 Oct 2024 10:33:41 +0100
Subject: [PATCH] Fix proxy v1 tests

---
 src/proxy_v1.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/proxy_v1.c b/src/proxy_v1.c
index f544999619..77ffe555ed 100644
--- a/src/proxy_v1.c
+++ b/src/proxy_v1.c
@@ -66,12 +66,15 @@ static int proxy_v1__decode(struct mosquitto *context)
 		return MOSQ_ERR_INVAL;
 	}
 
+	context->proxy.buf[context->proxy.pos-1] = '\0';
+	context->proxy.buf[context->proxy.pos-2] = '\0';
 	saddr_s = strtok_r((char *)&context->proxy.buf[sizeof(signature4)], " ", &saveptr);
 	daddr_s = strtok_r(NULL, " ", &saveptr);
 	sport_s = strtok_r(NULL, " ", &saveptr);
 	dport_s = strtok_r(NULL, " ", &saveptr);
 
-	if(!saddr_s || !daddr_s || !sport_s || !dport_s || !saveptr || saveptr[0] != '\0'){
+
+	if(!saddr_s || !daddr_s || !sport_s || !dport_s || saveptr){
 		log__printf(NULL, MOSQ_LOG_NOTICE, "Connection rejected, corrupt PROXY header.");
 		proxy_cleanup(context);
 		return MOSQ_ERR_INVAL;