summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-06-04 17:33:33 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-06-04 17:33:33 (GMT)
commit64c26e5f6004523090c52970d1ed31a351617f38 (patch)
tree1fb3d95f1e3a6b1164a2458b2e95b2a56eef4bca /Objects
parenta5071c2b4cff9c51fc0fd106a3d42b9a2563eb91 (diff)
parent64a263a1ceed726494767d833a2ea33033a6ae28 (diff)
downloadcpython-64c26e5f6004523090c52970d1ed31a351617f38.zip
cpython-64c26e5f6004523090c52970d1ed31a351617f38.tar.gz
cpython-64c26e5f6004523090c52970d1ed31a351617f38.tar.bz2
Issue #20041: Fixed TypeError when frame.f_trace is set to None.
Patch by Xavier de Gaye.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/frameobject.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 492886f..b115614 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -344,6 +344,8 @@ frame_settrace(PyFrameObject *f, PyObject* v, void *closure)
/* We rely on f_lineno being accurate when f_trace is set. */
f->f_lineno = PyFrame_GetLineNumber(f);
+ if (v == Py_None)
+ v = NULL;
Py_XINCREF(v);
Py_XSETREF(f->f_trace, v);