bpo-40429: PyFrame_GetCode() now returns a strong reference (GH-19773)
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 39cf6e1..5e53d83 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -390,14 +390,19 @@
{
PyCodeObject *code = PyFrame_GetCode(frame);
ptrace_enter_call(self, (void *)code, (PyObject *)code);
+ Py_DECREF(code);
break;
}
/* the 'frame' of a called function is about to finish
(either normally or with an exception) */
case PyTrace_RETURN:
- ptrace_leave_call(self, (void *)PyFrame_GetCode(frame));
+ {
+ PyCodeObject *code = PyFrame_GetCode(frame);
+ ptrace_leave_call(self, (void *)code);
+ Py_DECREF(code);
break;
+ }
/* case PyTrace_EXCEPTION:
If the exception results in the function exiting, a
diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c
index b2a0003..24628a9 100644
--- a/Modules/_tracemalloc.c
+++ b/Modules/_tracemalloc.c
@@ -335,26 +335,24 @@
static void
tracemalloc_get_frame(PyFrameObject *pyframe, frame_t *frame)
{
- PyCodeObject *code;
- PyObject *filename;
- _Py_hashtable_entry_t *entry;
- int lineno;
-
frame->filename = unknown_filename;
- lineno = PyFrame_GetLineNumber(pyframe);
- if (lineno < 0)
+ int lineno = PyFrame_GetLineNumber(pyframe);
+ if (lineno < 0) {
lineno = 0;
+ }
frame->lineno = (unsigned int)lineno;
- code = PyFrame_GetCode(pyframe);
- if (code->co_filename == NULL) {
+ PyCodeObject *code = PyFrame_GetCode(pyframe);
+ PyObject *filename = code->co_filename;
+ Py_DECREF(code);
+
+ if (filename == NULL) {
#ifdef TRACE_DEBUG
tracemalloc_error("failed to get the filename of the code object");
#endif
return;
}
- filename = code->co_filename;
assert(filename != NULL);
if (filename == NULL)
return;
@@ -375,6 +373,7 @@
}
/* intern the filename */
+ _Py_hashtable_entry_t *entry;
entry = _Py_HASHTABLE_GET_ENTRY(tracemalloc_filenames, filename);
if (entry != NULL) {
_Py_HASHTABLE_ENTRY_READ_KEY(tracemalloc_filenames, entry, filename);