Fixed SetStringPointer unable to accept None.

addons/source-python/packages/source-python/memory/manager.py

@@ -471,11 +471,12 @@ def fset(ptr, value):
                 # Handle string pointer type
                 if type_name == Type.STRING_POINTER:
                     string_pointer = ptr.set_string_pointer(value, offset)
-                    string_pointer.auto_dealloc = True
+                    if string_pointer:
+                        string_pointer.auto_dealloc = True
 
-                    # Make sure the value will not deallocate as long as it is
-                    # part of this object
-                    ptr._pointer_values[offset] = string_pointer
+                        # Make sure the value will not deallocate as long as
+                        # it is part of this object
+                        ptr._pointer_values[offset] = string_pointer
 
                 # Handle string array type
                 elif type_name == Type.STRING_ARRAY:
@@ -550,11 +551,12 @@ def fset(ptr, value):
                 if type_name == Type.STRING_POINTER:
                     string_pointer = instance_ptr.set_string_pointer(
                         value, offset)
-                    string_pointer.auto_dealloc = True
+                    if string_pointer:
+                        string_pointer.auto_dealloc = True
 
-                    # Make sure the value will not deallocate as long as it is
-                    # part of this object
-                    ptr._pointer_values[offset] = string_pointer
+                        # Make sure the value will not deallocate as long as
+                        # it is part of this object
+                        ptr._pointer_values[offset] = string_pointer
 
                 # Handle string array type
                 elif type_name == Type.STRING_ARRAY:

src/core/modules/memory/memory_pointer.cpp

@@ -102,21 +102,24 @@ const char * CPointer::GetStringPointer(int iOffset /* = 0 */)
 	return result;
 }
 
-CPointer * CPointer::SetStringPointer(str oString, int iOffset /* = 0 */)
+CPointer * CPointer::SetStringPointer(char * szText, int iOffset /* = 0 */)
 {
 	Validate();
 
-	// 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.");
+	char * value;
 
-	// Get string and length of bytes.
-	const char * szString = PyBytes_AS_STRING(pObj);
-	unsigned long length = PyBytes_GET_SIZE(pObj) + 1;
+	if (szText)
+	{
+		// Get length of string.
+		unsigned long length = strlen(szText) + 1;
 
-	char * value = (char *) UTIL_Alloc(length);
-	memcpy(value, szString, length);
+		value = (char *) UTIL_Alloc(length);
+		memcpy(value, szText, length);
+	}
+	else
+	{
+		value = szText;
+	}
 
 	TRY_SEGV()
 		*(const char **) (m_ulAddr + iOffset) = value;

src/core/modules/memory/memory_pointer.h

@@ -137,7 +137,7 @@ class CPointer
 	}
 
 	const char *        GetStringPointer(int iOffset = 0);
-	CPointer*           SetStringPointer(str oString, int iOffset = 0);
+	CPointer*           SetStringPointer(char * szText, int iOffset = 0);
 
 	const char *        GetStringArray(int iOffset = 0);
 	void                SetStringArray(char* szText, int iOffset = 0);