summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2009-02-03 02:12:10 (GMT)
committerRaymond Hettinger <python@rcn.com>2009-02-03 02:12:10 (GMT)
commit5d65412d35231ffab837478f575fcd326bbcac80 (patch)
tree4aaf978cd805db3be557cf407e3c7297481d7f1a /Objects
parent94a45da6be7a1c0ac255741576e7707649a57859 (diff)
downloadcpython-5d65412d35231ffab837478f575fcd326bbcac80.zip
cpython-5d65412d35231ffab837478f575fcd326bbcac80.tar.gz
cpython-5d65412d35231ffab837478f575fcd326bbcac80.tar.bz2
Validate that __length_hint__ returns a usable result.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/abstract.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 86e2c39..7d0ed06 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -105,7 +105,7 @@ _PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
PyErr_Clear();
return defaultvalue;
}
- rv = PyLong_AsSsize_t(ro);
+ rv = PyLong_Check(ro) ? PyLong_AsSsize_t(ro) : defaultvalue;
Py_DECREF(ro);
return rv;
}