fix

effekseer · Jul 22, 2023 · bd12c45 · bd12c45
1 parent 19f7ff9
commit bd12c45
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/Dev/Cpp/Effekseer/Effekseer/Utils/String.h b/Dev/Cpp/Effekseer/Effekseer/Utils/String.h
@@ -107,7 +107,7 @@ class FixedSizeString
 	FixedSizeString(const T* ptr)
 	{
 		size_t original_length = Traits::length(ptr);
-		size_ = std::min(data_.size() - 1, original_length);
+		size_ = std::min(data_.size(), original_length);
 		memcpy(data_.data(), ptr, size_ * sizeof(T));
 		data_[size_] = 0;
 	}
@@ -162,7 +162,7 @@ class FixedSizeString
 	}
 
 private:
-	std::array<T, N> data_;
+	std::array<T, N + 1> data_;
 	size_t size_;
 };
 

diff --git a/Dev/Cpp/Test/Runtime/String.cpp b/Dev/Cpp/Test/Runtime/String.cpp
@@ -1,5 +1,18 @@
 #include "../TestHelper.h"
 #include <Effekseer.h>
+#include <iostream>
+
+#define TEST_EQUAL_STR(x, y)                                    \
+	if ((x) != (y))                                             \
+	{                                                           \
+		std::cout << "Test failed : " << __LINE__ << std::endl; \
+		abort();                                                \
+	}
+
+void FixedSizeStringTest()
+{
+	TEST_EQUAL_STR((std::u16string(u"1234")), (Effekseer::FixedSizeString<char16_t, 4>(u"12345").data()));
+}
 
 void StringAndPathHelperTest()
 {
@@ -63,6 +76,9 @@ void StringAndPathHelperTest()
 
 #if defined(__linux__) || defined(__APPLE__) || defined(WIN32)
 
+TestRegister Runtime_FixedSizeStringTest("Runtime.FixedSizeStringTest", []() -> void
+										 { FixedSizeStringTest(); });
+
 TestRegister Runtime_StringAndPathHelperTest("Runtime.StringAndPathHelperTest", []() -> void
 											 { StringAndPathHelperTest(); });