Commit 43fb54cd authored by Antoine Pitrou's avatar Antoine Pitrou

Issue #10182: The re module doesn't truncate indices to 32 bits anymore.

Patch by Serhiy Storchaka.
parent 56379c0d
from test.support import verbose, run_unittest, gc_collect
from test.support import verbose, run_unittest, gc_collect, bigmemtest, _2G
import io
import re
from re import Scanner
......@@ -854,6 +854,21 @@ class ReTests(unittest.TestCase):
# Test behaviour when not given a string or pattern as parameter
self.assertRaises(TypeError, re.compile, 0)
# The huge memuse is because of re.sub() using a list and a join()
# to create the replacement result.
@bigmemtest(size=_2G, memuse=20)
def test_large(self, size):
# Issue #10182: indices were 32-bit-truncated.
s = 'a' * size
m = re.search('$', s)
self.assertIsNotNone(m)
self.assertEqual(m.start(), size)
self.assertEqual(m.end(), size)
r, n = re.subn('', '', s)
self.assertEqual(r, s)
self.assertEqual(n, size + 1)
def run_re_tests():
from test.re_tests import tests, SUCCEED, FAIL, SYNTAX_ERROR
if verbose:
......
......@@ -169,6 +169,9 @@ Core and Builtins
Library
-------
- Issue #10182: The re module doesn't truncate indices to 32 bits anymore.
Patch by Serhiy Storchaka.
- Issue #16573: In 2to3, treat enumerate() like a consuming call, so superfluous
list() calls aren't added to filter(), map(), and zip() which are directly
passed enumerate().
......
......@@ -1629,7 +1629,7 @@ static PyObject*pattern_scanner(PatternObject*, PyObject*);
static PyObject *
sre_codesize(PyObject* self, PyObject *unused)
{
return Py_BuildValue("l", sizeof(SRE_CODE));
return PyLong_FromSize_t(sizeof(SRE_CODE));
}
static PyObject *
......@@ -2467,7 +2467,7 @@ next:
return NULL;
if (subn)
return Py_BuildValue("Ni", item, n);
return Py_BuildValue("Nn", item, n);
return item;
......@@ -3423,7 +3423,7 @@ match_start(MatchObject* self, PyObject* args)
}
/* mark is -1 if group is undefined */
return Py_BuildValue("i", self->mark[index*2]);
return PyLong_FromSsize_t(self->mark[index*2]);
}
static PyObject*
......@@ -3446,7 +3446,7 @@ match_end(MatchObject* self, PyObject* args)
}
/* mark is -1 if group is undefined */
return Py_BuildValue("i", self->mark[index*2+1]);
return PyLong_FromSsize_t(self->mark[index*2+1]);
}
LOCAL(PyObject*)
......@@ -3596,7 +3596,7 @@ static PyObject *
match_lastindex_get(MatchObject *self)
{
if (self->lastindex >= 0)
return Py_BuildValue("i", self->lastindex);
return PyLong_FromSsize_t(self->lastindex);
Py_INCREF(Py_None);
return Py_None;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment