Removed another occurrence of PyInt_ExactCheck()

tiran · tiran · commit 0fbab7ff8d2e · 2007-12-04T21:55:18.000Z
I've modified the semantic of PyTraceBack_Print and sys.tracebacklimit slightly. Overfloats or values &lt;= 0 are replaced with a default value to avoid infinite recursion and other issues.
diff --git a/Python/traceback.c b/Python/traceback.c
@@ -242,23 +242,42 @@ tb_printinternal(PyTracebackObject *tb, PyObject *f, int limit)
 	return err;
 }
 
+#define PyTraceBack_LIMIT 1000
+
 int
 PyTraceBack_Print(PyObject *v, PyObject *f)
 {
 	int err;
 	PyObject *limitv;
-	int limit = 1000;
+	int limit = PyTraceBack_LIMIT;
+
 	if (v == NULL)
 		return 0;
 	if (!PyTraceBack_Check(v)) {
 		PyErr_BadInternalCall();
 		return -1;
 	}
 	limitv = PySys_GetObject("tracebacklimit");
-	if (limitv && PyInt_CheckExact(limitv)) {
+	if (limitv) {
+		PyObject *exc_type, *exc_value, *exc_tb;
+
+		PyErr_Fetch(&exc_type, &exc_value, &exc_tb);
 		limit = PyLong_AsLong(limitv);
-		if (limit <= 0)
-			return 0;
+		if (limit == -1 && PyErr_Occurred()) {
+			if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
+				limit = PyTraceBack_LIMIT;
+			}
+			else {
+				Py_XDECREF(exc_type);
+				Py_XDECREF(exc_value);
+				Py_XDECREF(exc_tb);
+				return 0;
+			}
+		}
+		else if (limit <= 0) {
+			limit = PyTraceBack_LIMIT;
+		}
+		PyErr_Restore(exc_type, exc_value, exc_tb);
 	}
 	err = PyFile_WriteString("Traceback (most recent call last):\n", f);
 	if (!err)
