Merge branch 'hotfix/invalid-utf8-crash'

hooks.c

@@ -126,6 +126,7 @@ void __cdecl My_SV_SetConfigstring(int index, char* value) {
         return;
     }
 
+    if (!value) value = "";
     char* res = SetConfigstringDispatcher(index, value);
     // NULL means stop the event.
     if (res)

python/minqlx/_core.py

@@ -30,7 +30,6 @@
 import datetime
 import os.path
 import logging
-import shutil
 import shlex
 import sys
 import os

python/minqlx/_handlers.py

@@ -339,7 +339,7 @@ def handle_console_print(text):
 
     """
     try:
-        text = text.decode(errors="ignore").rstrip()
+        text = text.rstrip()
         if not text:
             return
 

python/minqlx/_zmq.py

@@ -20,6 +20,7 @@
 we get stats from it. It polls the ZMQ socket approx. every 0.25 seconds."""
 
 import minqlx
+import json
 import zmq
 
 class StatsListener():
@@ -59,7 +60,7 @@ def keep_receiving(self):
             if self.done:
                 return
             while True: # Will throw an expcetion if no more data to get.
-                stats = self.socket.recv_json(zmq.NOBLOCK)
+                stats = json.loads(self.socket.recv(zmq.NOBLOCK).decode(errors="ignore"))
                 minqlx.EVENT_DISPATCHERS["stats"].dispatch(stats)
 
                 if stats["TYPE"] == "MATCH_STARTED":

python_dispatchers.c

@@ -12,7 +12,8 @@ char* ClientCommandDispatcher(int client_id, char* cmd) {
 
     PyGILState_STATE gstate = PyGILState_Ensure();
 
-    PyObject* result = PyObject_CallFunction(client_command_handler, "is", client_id, cmd);
+    PyObject* cmd_string = PyUnicode_DecodeUTF8(cmd, strlen(cmd), "ignore");
+    PyObject* result = PyObject_CallFunction(client_command_handler, "iO", client_id, cmd_string);
 
     if (result == NULL)
         DebugError("PyObject_CallFunction() returned NULL.\n",
@@ -22,6 +23,7 @@ char* ClientCommandDispatcher(int client_id, char* cmd) {
     else if (PyUnicode_Check(result))
         ret = PyUnicode_AsUTF8(result);
 
+    Py_XDECREF(cmd_string);
     Py_XDECREF(result);
 
     PyGILState_Release(gstate);
@@ -35,7 +37,8 @@ char* ServerCommandDispatcher(int client_id, char* cmd) {
 
     PyGILState_STATE gstate = PyGILState_Ensure();
 
-    PyObject* result = PyObject_CallFunction(server_command_handler, "is", client_id, cmd);
+    PyObject* cmd_string = PyUnicode_DecodeUTF8(cmd, strlen(cmd), "ignore");
+    PyObject* result = PyObject_CallFunction(server_command_handler, "iO", client_id, cmd_string);
 
     if (result == NULL)
         DebugError("PyObject_CallFunction() returned NULL.\n",
@@ -45,6 +48,7 @@ char* ServerCommandDispatcher(int client_id, char* cmd) {
     else if (PyUnicode_Check(result))
         ret = PyUnicode_AsUTF8(result);
 
+    Py_XDECREF(cmd_string);
     Py_XDECREF(result);
 
     PyGILState_Release(gstate);
@@ -163,7 +167,8 @@ char* SetConfigstringDispatcher(int index, char* value) {
 
 	PyGILState_STATE gstate = PyGILState_Ensure();
 
-	PyObject* result = PyObject_CallFunction(set_configstring_handler, "is", index, value);
+    PyObject* value_string = PyUnicode_DecodeUTF8(value, strlen(value), "ignore");
+	PyObject* result = PyObject_CallFunction(set_configstring_handler, "iO", index, value_string);
 
 	if (result == NULL)
 		DebugError("PyObject_CallFunction() returned NULL.\n",
@@ -173,6 +178,7 @@ char* SetConfigstringDispatcher(int index, char* value) {
 	else if (PyUnicode_Check(result))
 		ret = PyUnicode_AsUTF8(result);
 
+    Py_XDECREF(value_string);
 	Py_XDECREF(result);
 
 	PyGILState_Release(gstate);
@@ -202,7 +208,8 @@ char* ConsolePrintDispatcher(char* text) {
 
     PyGILState_STATE gstate = PyGILState_Ensure();
 
-    PyObject* result = PyObject_CallFunction(console_print_handler, "y", text);
+    PyObject* text_string = PyUnicode_DecodeUTF8(text, strlen(text), "ignore");
+    PyObject* result = PyObject_CallFunction(console_print_handler, "O", text_string);
 
     if (result == NULL)
         DebugError("PyObject_CallFunction() returned NULL.\n",
@@ -212,6 +219,7 @@ char* ConsolePrintDispatcher(char* text) {
     else if (PyUnicode_Check(result))
         ret = PyUnicode_AsUTF8(result);
 
+    Py_XDECREF(text_string);
     Py_XDECREF(result);
 
     PyGILState_Release(gstate);

python_embed.c

@@ -88,7 +88,7 @@ static PyObject* makePlayerDict(int client_id) {
 	Py_DECREF(state);
 
 	// USERINFO
-	PyObject* userinfo = PyUnicode_FromString(svs->clients[client_id].userinfo);
+	PyObject* userinfo = PyUnicode_DecodeUTF8(svs->clients[client_id].userinfo, strlen(svs->clients[client_id].userinfo), "ignore");
 	if (PyDict_SetItemString(ret, "userinfo", userinfo) == -1) {
 		DebugError("Failed to add 'userinfo' to the dictionary.\n",
 				__FILE__, __LINE__, __func__);
@@ -109,7 +109,8 @@ static PyObject* makePlayerDict(int client_id) {
 
     if (g_entities[client_id].client) {
         // NAME
-        PyObject* name = PyUnicode_FromString(g_entities[client_id].client->pers.netname);
+        PyObject* name = PyUnicode_DecodeUTF8(g_entities[client_id].client->pers.netname,
+            strlen(g_entities[client_id].client->pers.netname), "ignore");
         if (PyDict_SetItemString(ret, "name", name) == -1) {
             DebugError("Failed to add 'name' to the dictionary.\n",
                     __FILE__, __LINE__, __func__);
@@ -210,7 +211,7 @@ static PyObject* PyMinqlx_GetUserinfo(PyObject* self, PyObject* args) {
     else if (allow_free_client != i && svs->clients[i].state == CS_FREE)
         Py_RETURN_NONE;
 
-    return PyUnicode_FromString(svs->clients[i].userinfo);
+    return PyUnicode_DecodeUTF8(svs->clients[i].userinfo, strlen(svs->clients[i].userinfo), "ignore");
 }
 
 /*
@@ -419,7 +420,7 @@ static PyObject* PyMinqlx_GetConfigstring(PyObject* self, PyObject* args) {
 	}
 
     SV_GetConfigstring(i, csbuffer, sizeof(csbuffer));
-    return PyUnicode_FromString(csbuffer);
+    return PyUnicode_DecodeUTF8(csbuffer, strlen(csbuffer), "ignore");
 }
 
 /*