From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 29 Jan 2024 10:54:19 +0000 (+0000)
Subject: python: Make sure we hold the GIL when jumping into the logging callback
X-Git-Tag: 0.9.30~1238
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3f0778caa0d82c0044c9c1620d76d3d03795371;p=pakfire.git

python: Make sure we hold the GIL when jumping into the logging callback

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/_pakfire/pakfire.c b/src/_pakfire/pakfire.c
index a5a45e547..b82f28a54 100644
--- a/src/_pakfire/pakfire.c
+++ b/src/_pakfire/pakfire.c
@@ -424,29 +424,39 @@ static PyObject* Pakfire_version_compare(PakfireObject* self, PyObject* args) {
 static int Pakfire_execute_output_callback(struct pakfire_ctx* ctx, struct pakfire_jail* jail,
 		void* data, const char* line, size_t length) {
 	PyObject* callback = (PyObject*)data;
-	int r = 0;
+	PyObject* args = NULL;
+	PyObject* result = NULL;
+	int r = 1;
 
 	// Do nothing if callback isn't set
 	if (!callback)
 		return 0;
 
 	// Remove the trailing newline
-	if (line && line[length - 1] == '\n')
+	if (line && length && line[length - 1] == '\n')
 		length--;
 
+	// Get the GIL
+	PyGILState_STATE state = PyGILState_Ensure();
+
 	// Create tuple with arguments for the callback function
-	PyObject* args = Py_BuildValue("(is#)", LOG_INFO, line, (Py_ssize_t)length);
+	args = Py_BuildValue("(is#)", LOG_INFO, line, (Py_ssize_t)length);
 	if (!args)
-		return 1;
+		goto ERROR;
 
-	PyObject* result = PyObject_CallObject(callback, args);
+	// Call the callback method
+	result = PyObject_CallObject(callback, args);
     if (result && PyLong_Check(result)) {
         r = PyLong_AsLong(result);
     }
 
+ERROR:
 	Py_XDECREF(args);
 	Py_XDECREF(result);
 
+	// Release the GIL
+	PyGILState_Release(state);
+
 	return r;
 }