From 6ff4af8e182333740a58176a3e9cbc84f6828216 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Wed, 19 Jan 2022 11:59:19 +0100 Subject: [lldb] Fix D114722 for python<=3.6 _Py_IsFinalizing was called _Py_Finalizing back then (and it was a variable instead of a function). --- .../ScriptInterpreter/Python/PythonDataObjects.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp') diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp index 13dabb2..32020f9 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp @@ -69,6 +69,28 @@ Expected python::As(Expected &&obj) { return std::string(utf8.get()); } +static bool python_is_finalizing() { +#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 7 + return _Py_Finalizing != nullptr; +#else + return _Py_IsFinalizing(); +#endif +} + +void PythonObject::Reset() { + if (m_py_obj && Py_IsInitialized()) { + if (python_is_finalizing()) { + // Leak m_py_obj rather than crashing the process. + // https://docs.python.org/3/c-api/init.html#c.PyGILState_Ensure + } else { + PyGILState_STATE state = PyGILState_Ensure(); + Py_DECREF(m_py_obj); + PyGILState_Release(state); + } + } + m_py_obj = nullptr; +} + Expected PythonObject::AsLongLong() const { if (!m_py_obj) return nullDeref(); -- cgit v1.1