Fixed #452.

Author: jordanbriere

addons/source-python/packages/source-python/messages/impl.py

@@ -135,8 +135,9 @@ def read_protobuf(buffer):
             index=buffer.get_int32('ent_idx'),
             chat=buffer.get_bool('chat'),
             message=buffer.get_string('msg_name'),
-            param1=buffer.get_repeated_string('params', 0),
-            param2=buffer.get_repeated_string('params', 1),
+            # See issues #27, #186 and #452.
+            param1=buffer.get_repeated_string('params', 0, 'ignore'),
+            param2=buffer.get_repeated_string('params', 1, 'ignore'),
             param3=buffer.get_repeated_string('params', 2),
             param4=buffer.get_repeated_string('params', 3))
 
@@ -156,8 +157,9 @@ def read_bitbuffer(buffer):
             index=buffer.read_byte(),
             chat=buffer.read_byte(),
             message=buffer.read_string(),
-            param1=buffer.read_string(),
-            param2=buffer.read_string(),
+            # See issues #27, #186 and #452.
+            param1=buffer.read_string('ignore'),
+            param2=buffer.read_string('ignore'),
             param3=buffer.read_string(),
             param4=buffer.read_string())
 

src/core/modules/bitbuffers/bitbuffers.h

@@ -87,13 +87,12 @@ class BitBufferReadExt
 		return BitByte(buffer.GetNumBitsRead());
 	}
 
-	static str ReadString(bf_read& buffer)
+	static str ReadString(bf_read& buffer, const char* szErrors = NULL)
 	{
-		char* pStr = new char[buffer.m_nDataBytes];
-		buffer.ReadString(pStr, buffer.m_nDataBytes);
-
+		char* pStr = buffer.ReadAndAllocateString();
 		// Let Boost handle deallocating the string
-		str result = str((const char *) pStr);
+		str result = make_str((const char *) pStr, szErrors);
+
 		delete pStr;
 		return result;
 	}

src/core/modules/bitbuffers/bitbuffers_wrap.cpp

@@ -320,7 +320,8 @@ void export_bf_read(scope _bitbuffers)
 		)
 
 		.def("read_string",
-			&BitBufferReadExt::ReadString
+			&BitBufferReadExt::ReadString,
+			("self", arg("errors")=object())
 		)
 
 		.add_property("num_bytes_left",

src/core/modules/messages/messages.h

@@ -36,6 +36,7 @@
 #include "public/engine/iserverplugin.h"
 #include "bitbuf.h"
 
+#include "utilities/sp_util.h"
 #include "modules/memory/memory_utilities.h"
 
 #ifdef USE_PROTOBUF
@@ -165,11 +166,11 @@
 		static bool GetBool(google::protobuf::Message* pMessage, const char* field_name)
 		{ return GetField<bool>(pMessage, &google::protobuf::Reflection::GetBool, field_name); }
 
-		static std::string GetString(google::protobuf::Message* pMessage, const char* field_name)
+		static str GetString(google::protobuf::Message* pMessage, const char* field_name, const char* szErrors = NULL)
 		{
 			std::string return_value;
 			return_value = pMessage->GetReflection()->GetStringReference(*pMessage, GetFieldDescriptor(pMessage, field_name), &return_value);
-			return return_value;
+			return make_str(return_value.c_str(), szErrors);
 		}
 
 		static int GetEnum(google::protobuf::Message* pMessage, const char* field_name)
@@ -220,11 +221,11 @@
 		static bool GetRepeatedBool(google::protobuf::Message* pMessage, const char* field_name, int index)
 		{ return GetRepeatedField<bool>(pMessage, &google::protobuf::Reflection::GetRepeatedBool, field_name, index); }
 
-		static std::string GetRepeatedString(google::protobuf::Message* pMessage, const char* field_name, int index)
+		static str GetRepeatedString(google::protobuf::Message* pMessage, const char* field_name, int index, const char* szErrors = NULL)
 		{
 			std::string return_value;
 			return_value = pMessage->GetReflection()->GetRepeatedStringReference(*pMessage, GetFieldDescriptor(pMessage, field_name), index, &return_value);
-			return return_value;
+			return make_str(return_value.c_str(), szErrors);
 		}
 
 		static int GetRepeatedEnum(google::protobuf::Message* pMessage, const char* field_name, int index)

src/core/modules/messages/messages_wrap.cpp

@@ -137,7 +137,11 @@ void export_protobuf_message(scope _messages)
 	ProtobufMessage.def("get_float", &CProtobufMessageExt::GetFloat);
 	ProtobufMessage.def("get_double", &CProtobufMessageExt::GetDouble);
 	ProtobufMessage.def("get_bool", &CProtobufMessageExt::GetBool);
-	ProtobufMessage.def("get_string", &CProtobufMessageExt::GetString);
+	ProtobufMessage.def(
+		"get_string",
+		&CProtobufMessageExt::GetString,
+		("self", "field_name", arg("errors")=object())
+	);
 	ProtobufMessage.def("get_enum", &CProtobufMessageExt::GetEnum);
 	ProtobufMessage.def("get_message", &CProtobufMessageExt::GetMessage, reference_existing_object_policy());
 
@@ -148,7 +152,11 @@ void export_protobuf_message(scope _messages)
 	ProtobufMessage.def("get_repeated_float", &CProtobufMessageExt::GetRepeatedFloat);
 	ProtobufMessage.def("get_repeated_double", &CProtobufMessageExt::GetRepeatedDouble);
 	ProtobufMessage.def("get_repeated_bool", &CProtobufMessageExt::GetRepeatedBool);
-	ProtobufMessage.def("get_repeated_string", &CProtobufMessageExt::GetRepeatedString);
+	ProtobufMessage.def(
+		"get_repeated_string",
+		&CProtobufMessageExt::GetRepeatedString,
+		("self", "field_name", "index", arg("errors")=object())
+	);
 	ProtobufMessage.def("get_repeated_enum", &CProtobufMessageExt::GetRepeatedEnum);
 	ProtobufMessage.def("get_repeated_message", &CProtobufMessageExt::GetRepeatedMessage, reference_existing_object_policy());
 

src/core/utilities/sp_util.h

@@ -96,6 +96,18 @@ inline bool CheckClassname(object obj, char* name)
 	return strcmp(extract<char *>(obj.attr("__class__").attr("__name__")), name) == 0;
 }
 
+//-----------------------------------------------------------------------------
+// Returns a Python string object.
+//-----------------------------------------------------------------------------
+inline str make_str(const char* pStr, const char* szErrors = NULL)
+{
+	if (!szErrors) {
+		return str(pStr);
+	}
+
+	return str(handle<>(PyUnicode_DecodeUTF8(pStr, strlen(pStr), szErrors)));
+}
+
 //-----------------------------------------------------------------------------
 // Returns the registered python class for T.
 //-----------------------------------------------------------------------------