Benjamin Peterson's patch to fix bug 3661, sys.call_tracing segfaults.

warsaw · warsaw · commit e94a37f3a1b4 · 2008-10-17T01:29:56.000Z
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -166,6 +166,9 @@ def test_getwindowsversion(self):
             self.assert_(isinstance(v[3], int))
             self.assert_(isinstance(v[4], str))
 
+    def test_call_tracing(self):
+        self.assertRaises(TypeError, sys.call_tracing, type, 2)
+
     def test_dlopenflags(self):
         if hasattr(sys, "setdlopenflags"):
             self.assert_(hasattr(sys, "getdlopenflags"))
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -783,7 +783,7 @@ static PyObject *
 sys_call_tracing(PyObject *self, PyObject *args)
 {
 	PyObject *func, *funcargs;
-	if (!PyArg_UnpackTuple(args, "call_tracing", 2, 2, &func, &funcargs))
+	if (!PyArg_ParseTuple(args, "OO!:call_tracing", &func, &PyTuple_Type, &funcargs))
 		return NULL;
 	return _PyEval_CallTracing(func, funcargs);
 }

Original file line number	Diff line number	Diff line change
`@@ -783,7 +783,7 @@ static PyObject *`
`783`	`783`	`sys_call_tracing(PyObject self, PyObject args)`
`784`	`784`	`{`
`785`	`785`	`PyObject func, funcargs;`
`786`		`- if (!PyArg_UnpackTuple(args, "call_tracing", 2, 2, &func, &funcargs))`
	`786`	`+ if (!PyArg_ParseTuple(args, "OO!:call_tracing", &func, &PyTuple_Type, &funcargs))`
`787`	`787`	`return NULL;`
`788`	`788`	`return _PyEval_CallTracing(func, funcargs);`
`789`	`789`	`}`