Fixed support for UTF8.

Fixed missing support for based_attribute.

Modified the description of SetStringPointer.

Author: CookStar

addons/source-python/packages/source-python/entities/classes.py

@@ -359,7 +359,8 @@ def _get_server_class(self, class_name, datamap):
             attribute = method(
                 Key.as_attribute_type(self, data['type']),
                 offset,
-                data.get('doc')
+                data.get('doc'),
+                Key.as_int(self, data.get('length', 0)),
             )
 
             # Assign the attribute to the instance

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))
@@ -533,7 +533,7 @@ def fset(ptr, value):
                 if not instance_ptr:
                     # Allocate space for the value
                     if type_name == Type.STRING_ARRAY:
-                        size = length if length else len(value) + 1
+                        size = length if length else len(value.encode()) + 1
                     else:
                         size = TYPE_SIZES[type_name.upper()]
 
@@ -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))

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 */)

src/core/modules/memory/memory_wrap.cpp

@@ -229,7 +229,7 @@ void export_pointer(scope _memory)
 
 		.def("set_string_pointer",
 			&CPointer::SetStringPointer,
-			"Sets the value at the given memory location. This string object must be deallocated by the user. Returns the string object.",
+			"Sets the value at the given memory location. Returns the string object. This string object must be deallocated by the user.",
 			("value", arg( "offset")=0),
 			manage_new_object_policy()
 		)