1 files changed, 6 insertions, 4 deletions
diff --git a/src/zencore/string.cpp b/src/zencore/string.cpp
index 2691d14b8..34519b83b 100644
--- a/src/zencore/string.cpp
+++ b/src/zencore/string.cpp
@@ -56,20 +56,22 @@ bool
 ToString(std::span<char> Buffer, uint64_t Num)
 {
 	auto [Ptr, Ec] = std::to_chars(Buffer.data(), Buffer.data() + Buffer.size(), Num);
-	if (Ec == std::errc{})
+	if (Ec != std::errc{} || Ptr == Buffer.data() + Buffer.size())
 	{
-		*Ptr = '\0';
+		return false;
 	}
+	*Ptr = '\0';
 	return true;
 }
 bool
 ToString(std::span<char> Buffer, int64_t Num)
 {
 	auto [Ptr, Ec] = std::to_chars(Buffer.data(), Buffer.data() + Buffer.size(), Num);
-	if (Ec == std::errc{})
+	if (Ec != std::errc{} || Ptr == Buffer.data() + Buffer.size())
 	{
-		*Ptr = '\0';
+		return false;
 	}
+	*Ptr = '\0';
 	return true;
 }