From 225787ea39e7363fb0f5668cb81a70ee0c4f90f9 Mon Sep 17 00:00:00 2001
From: def <dennis@felsin9.de>
Date: Mon, 9 Nov 2020 15:38:55 +0100
Subject: [PATCH] Fix invalid server-assigned utf8 names with (1) prefix (fixes
 #3269)

---
 src/engine/server/server.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index 27bfd4464..4e916c9a2 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -394,7 +394,9 @@ bool CServer::SetClientNameImpl(int ClientID, const char *pNameRequest, bool Set
 		// auto rename
 		for(int i = 1;; i++)
 		{
-			str_format(aNameTry, sizeof(aNameTry), "(%d)%s", i, aTrimmedName);
+			char aNameTryBrokenEnd[MAX_NAME_LENGTH];
+			str_format(aNameTryBrokenEnd, sizeof(aNameTryBrokenEnd), "(%d)%s", i, aTrimmedName);
+			str_utf8_copy(aNameTry, aNameTryBrokenEnd, sizeof(aNameTry));
 			if(IsClientNameAvailable(ClientID, aNameTry))
 				break;
 		}