From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Thu, 25 Jul 2002 16:43:29 +0000 (+0000)
Subject: Don't be so hasty.  If PyInt_AsLong() raises an error, don't set ValueError.
X-Git-Tag: v2.3c1~4869
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73a088e3fafbfc8b925163a3b0aa626830d26aa0;p=thirdparty%2FPython%2Fcpython.git

Don't be so hasty.  If PyInt_AsLong() raises an error, don't set ValueError.
---

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 96fc7cd12c68..3def1343c05a 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2972,6 +2972,8 @@ slot_sq_length(PyObject *self)
 		return -1;
 	len = (int)PyInt_AsLong(res);
 	Py_DECREF(res);
+	if (len == -1 && PyErr_Occurred())
+		return -1;
 	if (len < 0) {
 		PyErr_SetString(PyExc_ValueError, 
 				"__len__() should return >= 0");