From 1d286a1b93d34c758565d3c292ec9e4aee05f89f Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Wed, 23 Oct 2024 12:25:57 +1100
Subject: [PATCH] Fix #129302: GIL not released if poll_message_set was passed
 a string

Regression in [0].

Co-authored-by: Jorn Visser <git@jornvisser.com>

[0]: ebe04bd3cafaa1f88bd51eee5b3e7bef38ae69bc
---
 .../blender/python/intern/bpy_rna_operator.cc | 64 ++++++++++---------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/source/blender/python/intern/bpy_rna_operator.cc b/source/blender/python/intern/bpy_rna_operator.cc
index a3c068417d5..eda7ee287af 100644
--- a/source/blender/python/intern/bpy_rna_operator.cc
+++ b/source/blender/python/intern/bpy_rna_operator.cc
@@ -32,44 +32,46 @@ static char *pyop_poll_message_get_fn(bContext * /*C*/, void *user_data)
   PyObject *py_args = static_cast<PyObject *>(user_data);
   PyObject *py_func_or_msg = PyTuple_GET_ITEM(py_args, 0);
 
+  char *msg = nullptr;
+
   if (PyUnicode_Check(py_func_or_msg)) {
     Py_ssize_t msg_len;
-    const char *msg = PyUnicode_AsUTF8AndSize(py_func_or_msg, &msg_len);
-    return BLI_strdupn(msg, msg_len);
-  }
-
-  PyObject *py_args_after_first = PyTuple_GetSlice(py_args, 1, PY_SSIZE_T_MAX);
-  PyObject *py_msg = PyObject_CallObject(py_func_or_msg, py_args_after_first);
-  Py_DECREF(py_args_after_first);
-
-  char *msg = nullptr;
-  bool error = false;
-
-  /* nullptr for no string. */
-  if (py_msg == nullptr) {
-    error = true;
+    const char *msg_src = PyUnicode_AsUTF8AndSize(py_func_or_msg, &msg_len);
+    msg = BLI_strdupn(msg_src, msg_len);
   }
   else {
-    if (py_msg == Py_None) {
-      /* pass */
-    }
-    else if (PyUnicode_Check(py_msg)) {
-      Py_ssize_t msg_src_len;
-      const char *msg_src = PyUnicode_AsUTF8AndSize(py_msg, &msg_src_len);
-      msg = BLI_strdupn(msg_src, msg_src_len);
-    }
-    else {
-      PyErr_Format(PyExc_TypeError,
-                   "poll_message_set(function, ...): expected string or None, got %.200s",
-                   Py_TYPE(py_msg)->tp_name);
+    PyObject *py_args_after_first = PyTuple_GetSlice(py_args, 1, PY_SSIZE_T_MAX);
+    PyObject *py_msg = PyObject_CallObject(py_func_or_msg, py_args_after_first);
+    Py_DECREF(py_args_after_first);
+
+    bool error = false;
+
+    /* Null for no string. */
+    if (py_msg == nullptr) {
       error = true;
     }
-    Py_DECREF(py_msg);
-  }
+    else {
+      if (py_msg == Py_None) {
+        /* Pass. */
+      }
+      else if (PyUnicode_Check(py_msg)) {
+        Py_ssize_t msg_src_len;
+        const char *msg_src = PyUnicode_AsUTF8AndSize(py_msg, &msg_src_len);
+        msg = BLI_strdupn(msg_src, msg_src_len);
+      }
+      else {
+        PyErr_Format(PyExc_TypeError,
+                     "poll_message_set(function, ...): expected string or None, got %.200s",
+                     Py_TYPE(py_msg)->tp_name);
+        error = true;
+      }
+      Py_DECREF(py_msg);
+    }
 
-  if (error) {
-    PyErr_Print();
-    PyErr_Clear();
+    if (error) {
+      PyErr_Print();
+      PyErr_Clear();
+    }
   }
 
   PyGILState_Release(gilstate);