Fixed support for UTF8.

Author: CookStar

Diff for: addons/source-python/packages/source-python/memory/manager.py

@@ -479,7 +479,7 @@ def fset(ptr, value):
 
                 # Handle string array type
                 elif type_name == Type.STRING_ARRAY:
-                    if length and len(value) >= length:
+                    if length and len(value.encode()) >= length:
                         raise ValueError(
                             'The string length exceeds'
                             'the limit "{0}".'.format(length-1))
@@ -558,7 +558,7 @@ def fset(ptr, value):
 
                 # Handle string array type
                 elif type_name == Type.STRING_ARRAY:
-                    if length and len(value) >= length:
+                    if length and len(value.encode()) >= length:
                         raise ValueError(
                             'The string length exceeds'
                             'the limit "{0}".'.format(length-1))

Diff for: src/core/modules/memory/memory_pointer.cpp

@@ -105,14 +105,24 @@ const char * CPointer::GetStringPointer(int iOffset /* = 0 */)
 CPointer * CPointer::SetStringPointer(str oString, int iOffset /* = 0 */)
 {
 	Validate();
-	unsigned long length = len(oString) + 1;
-	CPointer * pPtr = new CPointer((unsigned long) UTIL_Alloc(length), false);
-	char * value = (char *) pPtr->m_ulAddr;
-	memcpy(value, extract<const char *>(oString), length);
+
+	// Encode Unicode object and extract Python bytes object.
+	PyObject * pObj = PyUnicode_AsUTF8String(oString.ptr());
+	if (!pObj)
+		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Invalid UTF-8 string.");
+
+	// Get string and length of bytes.
+	const char * szString = PyBytes_AS_STRING(pObj);
+	unsigned long length = PyBytes_GET_SIZE(pObj) + 1;
+
+	char * value = (char *) UTIL_Alloc(length);
+	memcpy(value, szString, length);
+
 	TRY_SEGV()
 		*(const char **) (m_ulAddr + iOffset) = value;
 	EXCEPT_SEGV()
-	return pPtr;
+
+	return new CPointer((unsigned long) value, false);
 }
 
 const char * CPointer::GetStringArray(int iOffset /* = 0 */)