changeset:   101704:f993dbeb2ad2
parent:      101701:416441e4afab
parent:      101703:74ad78d2dd8d
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Sat Jun 04 20:33:33 2016 +0300
files:       Lib/test/test_sys_settrace.py Misc/NEWS Objects/frameobject.c
description:
Issue #20041: Fixed TypeError when frame.f_trace is set to None.
Patch by Xavier de Gaye.


diff -r 416441e4afab -r f993dbeb2ad2 Lib/test/test_sys_settrace.py
--- a/Lib/test/test_sys_settrace.py	Sat Jun 04 10:24:12 2016 -0700
+++ b/Lib/test/test_sys_settrace.py	Sat Jun 04 20:33:33 2016 +0300
@@ -388,6 +388,15 @@
              (257, 'line'),
              (257, 'return')])
 
+    def test_17_none_f_trace(self):
+        # Issue 20041: fix TypeError when f_trace is set to None.
+        def func():
+            sys._getframe().f_trace = None
+            lineno = 2
+        self.run_and_compare(func,
+            [(0, 'call'),
+             (1, 'line')])
+
 
 class RaisingTraceFuncTestCase(unittest.TestCase):
     def setUp(self):
diff -r 416441e4afab -r f993dbeb2ad2 Misc/NEWS
--- a/Misc/NEWS	Sat Jun 04 10:24:12 2016 -0700
+++ b/Misc/NEWS	Sat Jun 04 20:33:33 2016 +0300
@@ -120,6 +120,9 @@
 Core and Builtins
 -----------------
 
+- Issue #20041: Fixed TypeError when frame.f_trace is set to None.
+  Patch by Xavier de Gaye.
+
 - Issue #26168: Fixed possible refleaks in failing Py_BuildValue() with the "N"
   format unit.
 
diff -r 416441e4afab -r f993dbeb2ad2 Objects/frameobject.c
--- a/Objects/frameobject.c	Sat Jun 04 10:24:12 2016 -0700
+++ b/Objects/frameobject.c	Sat Jun 04 20:33:33 2016 +0300
@@ -344,6 +344,8 @@
     /* 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);