From: Walter Dörwald <walter@livinglogic.de>
Date: Tue, 17 Jun 2003 19:27:39 +0000 (+0000)
Subject: Use _PyEval_SliceIndex to handle list.index() calls with
X-Git-Tag: v2.3c1~393
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8049befdfa75501762f7b8afdf06335a2f6acba;p=python

Use _PyEval_SliceIndex to handle list.index() calls with
huge start and stop arguments. Add tests.
---

diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index 61f660b6ff..f39c51a4d0 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -374,6 +374,15 @@ if a.index(0,3) != 3: raise TestFailed, 'list index, start argument'
 if a.index(0,-3) != 3: raise TestFailed, 'list index, -start argument'
 if a.index(0,3,4) != 3: raise TestFailed, 'list index, stop argument'
 if a.index(0,-3,-2) != 3: raise TestFailed, 'list index, -stop argument'
+if a.index(0,-4*sys.maxint,4*sys.maxint) != 2:
+    raise TestFailed, 'list index, -maxint, maxint argument'
+try:
+    a.index(0, 4*sys.maxint,-4*sys.maxint)
+except ValueError:
+    pass
+else:
+    raise TestFailed, 'list index, maxint,-maxint argument'
+
 try:
     a.index(2,0,-10)
 except ValueError:
diff --git a/Objects/listobject.c b/Objects/listobject.c
index a70ac5ffa9..b059420f4a 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1832,7 +1832,9 @@ listindex(PyListObject *self, PyObject *args)
 	int i, start=0, stop=self->ob_size;
 	PyObject *v;
 
-	if (!PyArg_ParseTuple(args, "O|ii:index", &v, &start, &stop))
+	if (!PyArg_ParseTuple(args, "O|O&O&:index", &v,
+	                            _PyEval_SliceIndex, &start,
+	                            _PyEval_SliceIndex, &stop))
 		return NULL;
 	if (start < 0) {
 		start += self->ob_size;