Merge remote branch '1.0/1.0'

Conflicts:
	data/graphics/CMakeLists.txt
	data/graphics/Makefile.am
	src/client.cpp

2 files changed, 13 insertions, 0 deletions

diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 01bf0d3c..9fe3de14 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -21,10 +21,13 @@
 
 #include "utils/stringutils.h"
 
+#include <string.h>
 #include <algorithm>
 #include <cstdarg>
 #include <cstdio>
 
+const int UTF8_MAX_SIZE = 10;
+
 std::string &trim(std::string &str)
 {
     std::string::size_type pos = str.find_last_not_of(' ');
@@ -164,3 +167,11 @@ const std::string findSameSubstring(const std::string &str1, const std::string &
     }
     return str1.substr(0, minLength);
 }
+
+const char* getSafeUtf8String(std::string text)
+{
+    char* buf = new char[text.size() + UTF8_MAX_SIZE];
+    memcpy(buf, text.c_str(), text.size());
+    memset(buf + text.size(), 0, UTF8_MAX_SIZE);
+    return buf;
+}
\ No newline at end of file
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index 5e4718c0..ec82e240 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -123,4 +123,6 @@ bool isWordSeparator(char chr);
 
 const std::string findSameSubstring(const std::string &str1, const std::string &str2);
 
+const char* getSafeUtf8String(std::string text);
+
 #endif // UTILS_STRINGUTILS_H