moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

renderdoc: fix memleak with Python 3.11

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2022-09-24 13:38:33 +07:00
parent 7cc6ab9062
commit c9b446f7c5
1 changed files with 85 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

104
srcpkgs/renderdoc/patches/python-3.11.patch
View file

@ -1,11 +1,20 @@
--- a/qrenderdoc/Code/pyrenderdoc/function_conversion.h Index: renderdoc-1.21/qrenderdoc/Code/pyrenderdoc/function_conversion.h
+++ b/qrenderdoc/Code/pyrenderdoc/function_conversion.h ===================================================================
@@ -303,11 +303,19 @@ funcType ConvertFunc(const char *funcnam --- renderdoc-1.21.orig/qrenderdoc/Code/pyrenderdoc/function_conversion.h
+++ renderdoc-1.21/qrenderdoc/Code/pyrenderdoc/function_conversion.h
@@ -301,13 +301,30 @@ funcType ConvertFunc(const char *funcnam
{
_frame *frame = PyEval_GetFrame();
+#if PY_VERSION_HEX >= 0x030B0000
+ Py_INCREF(frame);
+#endif
while(frame) while(frame)
{ {
+#if PY_VERSION_HEX >= 0x030B0000 +#if PY_VERSION_HEX >= 0x030B0000
+ global_internal_handle = PyDict_GetItemString(PyFrame_GetGlobals(frame), "_renderdoc_internal"); + PyObject *f_globals = PyFrame_GetGlobals(frame);
+ global_internal_handle = PyDict_GetItemString(f_globals, "_renderdoc_internal");
+ Py_DECREF(f_globals);
+#else +#else
global_internal_handle = PyDict_GetItemString(frame->f_globals, "_renderdoc_internal"); global_internal_handle = PyDict_GetItemString(frame->f_globals, "_renderdoc_internal");
+#endif +#endif
@ -13,73 +22,130 @@
if(global_internal_handle) if(global_internal_handle)
break; break;
+#if PY_VERSION_HEX >= 0x03090000 +#if PY_VERSION_HEX >= 0x03090000
+ frame = PyFrame_GetBack(frame); + do {
+ PyFrameObject *f_back = PyFrame_GetBack(frame);
+ Py_DECREF(frame);
+ frame = f_back;
+ } while (0);
+#else +#else
frame = frame->f_back; frame = frame->f_back;
+#endif +#endif
} }
} }
--- a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp Index: renderdoc-1.21/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
+++ b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp ===================================================================
@@ -85,6 +85,15 @@ extern "C" PyObject *PyInit_qrenderdoc(v --- renderdoc-1.21.orig/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
+++ renderdoc-1.21/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
@@ -85,6 +85,33 @@ extern "C" PyObject *PyInit_qrenderdoc(v
extern "C" PyObject *WrapBareQWidget(QWidget *); extern "C" PyObject *WrapBareQWidget(QWidget *);
extern "C" QWidget *UnwrapBareQWidget(PyObject *); extern "C" QWidget *UnwrapBareQWidget(PyObject *);
+#if PY_VERSION_HEX <=0x030B0000 +#if PY_VERSION_HEX <=0x030B0000
+#define PyFrame_GetGlobals(x) (x)->f_globals +static inline PyObject *
+PyFrame_GetGlobals(PyFrameObject *frame)
+{
+ PyObject *f_globals = frame->f_globals;
+ Py_INCREF(f_globals);
+ return f_globals;
+}
+#endif +#endif
+ +
+#if PY_VERSION_HEX <=0x03090000 +#if PY_VERSION_HEX <=0x03090000
+#define PyFrame_GetBack(x) (x)->f_back +static inline PyFrameObject *
+#define PyFrame_GetCode(x) (x)->f_code +PyFrame_GetBack(PyFrameObject *frame)
+{
+ PyFrameObject *f_back = frame->f_back;
+ Py_INCREF(f_back);
+ return f_back;
+}
+static inline PyCodeObject *
+PyFrame_GetCode(PyFrameObject *frame)
+{
+ PyCodeObject *f_code = frame->f_code;
+ Py_INCREF(f_code);
+ return f_code;
+}
+#endif +#endif
+ +
// little utility function to convert a PyObject * that we know is a string to a QString // little utility function to convert a PyObject * that we know is a string to a QString
static inline QString ToQStr(PyObject *value) static inline QString ToQStr(PyObject *value)
{ {
@@ -1213,7 +1222,7 @@ PyObject *PythonContext::outstream_write @@ -1211,21 +1238,28 @@ PyObject *PythonContext::outstream_write
{
_frame *frame = PyEval_GetFrame();
+ Py_XINCREF(frame);
+
while(frame) while(frame)
{ {
- PyObject *globals = frame->f_globals; - PyObject *globals = frame->f_globals;
+ PyFrameObject *oframe = frame;
+ PyObject *globals = PyFrame_GetGlobals(frame); + PyObject *globals = PyFrame_GetGlobals(frame);
if(globals) if(globals)
{ {
+ Py_DECREF(globals);
OutputRedirector *global = OutputRedirector *global =
@@ -1225,7 +1234,7 @@ PyObject *PythonContext::outstream_write (OutputRedirector *)PyDict_GetItemString(globals, "_renderdoc_internal");
- if(global)
+ if(global) {
context = global->context;
+ Py_DECREF(globals);
+ }
}
if(context) if(context)
break; break;
- frame = frame->f_back; - frame = frame->f_back;
+ frame = PyFrame_GetBack(frame); + frame = PyFrame_GetBack(frame);
+ Py_DECREF(oframe);
} }
} }
@@ -1248,7 +1257,7 @@ PyObject *PythonContext::outstream_write @@ -1239,6 +1273,7 @@ PyObject *PythonContext::outstream_write
rdcstr message = text;
_frame *frame = PyEval_GetFrame();
+ Py_XINCREF(frame);
while(message.back() == '\n' || message.back() == '\r')
message.pop_back();
@@ -1248,7 +1283,9 @@ PyObject *PythonContext::outstream_write
if(frame) if(frame)
{ {
- filename = ToQStr(frame->f_code->co_filename); - filename = ToQStr(frame->f_code->co_filename);
+ filename = ToQStr(PyFrame_GetCode(frame)->co_filename); + PyCodeObject *code = PyFrame_GetCode(frame);
+ filename = ToQStr(code->co_filename);
+ Py_DECREF(code);
line = PyFrame_GetLineNumber(frame); line = PyFrame_GetLineNumber(frame);
} }
@@ -1278,7 +1287,7 @@ int PythonContext::traceEvent(PyObject * @@ -1278,12 +1315,14 @@ int PythonContext::traceEvent(PyObject *
PythonContext *context = (PythonContext *)thisint; PythonContext *context = (PythonContext *)thisint;
PyObject *compiled = PyDict_GetItemString(obj, "compiled"); PyObject *compiled = PyDict_GetItemString(obj, "compiled");
- if(compiled == (PyObject *)frame->f_code && what == PyTrace_LINE) - if(compiled == (PyObject *)frame->f_code && what == PyTrace_LINE)
+ if(compiled == (PyObject *)PyFrame_GetCode(frame) && what == PyTrace_LINE) + PyCodeObject *code = PyFrame_GetCode(frame);
+ if(compiled == (PyObject *)code && what == PyTrace_LINE)
{ {
context->location.line = PyFrame_GetLineNumber(frame); context->location.line = PyFrame_GetLineNumber(frame);
@@ -1361,7 +1370,7 @@ extern "C" void HandleException(PyObject emit context->traceLine(context->location.file, context->location.line);
}
+ Py_DECREF(code);
if(context->shouldAbort())
{
@@ -1361,7 +1400,9 @@ extern "C" void HandleException(PyObject
if(frame) if(frame)
{ {
- filename = ToQStr(frame->f_code->co_filename); - filename = ToQStr(frame->f_code->co_filename);
+ filename = ToQStr(PyFrame_GetCode(frame)->co_filename); + PyCodeObject *code = PyFrame_GetCode(frame);
+ filename = ToQStr(code->co_filename);
+ Py_DECREF(code);
linenum = PyFrame_GetLineNumber(frame); linenum = PyFrame_GetLineNumber(frame);
} }