diff Python/ceval.c @ 45613:54f1cb8a81f6 2.4

Revert the following revisions, as they don't fix security problems: 52448, 52468, 52472, 52475, 52646, 52797, 52802, 52863, 52999, 53001, 53101, 53371, 53373, 53383, 53384, 53736, 53812, 53921, 55578, 55580, 55581, 55772, 55775, 56557, 57093, 57094, 58630, 60114
author Martin v. Löwis <martin@v.loewis.de>
date Sun, 02 Mar 2008 17:47:51 +0000
parents 39ad99dd67e4
children
line wrap: on
line diff
--- a/Python/ceval.c	Sat Jan 19 22:35:09 2008 +0000
+++ b/Python/ceval.c	Sun Mar 02 17:47:51 2008 +0000
@@ -179,10 +179,10 @@
 PyObject *
 PyEval_GetCallStats(PyObject *self)
 {
-	return Py_BuildValue("iiiiiiiiiii",
+	return Py_BuildValue("iiiiiiiiii",
 			     pcall[0], pcall[1], pcall[2], pcall[3],
 			     pcall[4], pcall[5], pcall[6], pcall[7],
-			     pcall[8], pcall[9], pcall[10]);
+			     pcall[8], pcall[9]);
 }
 #else
 #define PCALL(O)
@@ -4073,10 +4073,8 @@
 		value = PyObject_GetAttr(v, name);
 		if (value == NULL)
 			err = -1;
-		else if (PyDict_CheckExact(locals))
+		else
 			err = PyDict_SetItem(locals, name, value);
-		else
-			err = PyObject_SetItem(locals, name, value);
 		Py_DECREF(name);
 		Py_XDECREF(value);
 		if (err != 0)