From 54c54fe37610951ae208f857180efc9fdf45f71c Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Sun, 1 Oct 2023 20:18:01 +0200 Subject: Sentry username fix (#435) * fix trailing null in Sentry username (GetUserName returns the length including NUL terminator) --- src/zenserver/zenserver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/zenserver') diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp index 40a797c21..fa7694573 100644 --- a/src/zenserver/zenserver.cpp +++ b/src/zenserver/zenserver.cpp @@ -1194,9 +1194,9 @@ ZenEntryPoint::Run() CHAR UserNameBuffer[511 + 1]; DWORD UserNameLength = sizeof(UserNameBuffer) / sizeof(CHAR); BOOL OK = GetUserNameA(UserNameBuffer, &UserNameLength); - if (OK) + if (OK && UserNameLength) { - SentryUserName = std::string(UserNameBuffer, UserNameLength); + SentryUserName = std::string(UserNameBuffer, UserNameLength - 1); } # endif // ZEN_PLATFORM_WINDOWS # if (ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC) -- cgit v1.2.3