mirror of
https://github.com/python/cpython.git
synced 2024-12-01 05:45:40 +08:00
Issue #29444: Fixed out-of-bounds buffer access in the group() method of
the match object. Based on patch by WGH.
This commit is contained in:
commit
86e42376c2
@ -1824,6 +1824,16 @@ SUBPATTERN None 0 0
|
||||
warnings.simplefilter('error', BytesWarning)
|
||||
self.assertNotEqual(pattern3, pattern1)
|
||||
|
||||
def test_bug_29444(self):
|
||||
s = bytearray(b'abcdefgh')
|
||||
m = re.search(b'[a-h]+', s)
|
||||
m2 = re.search(b'[e-h]+', s)
|
||||
self.assertEqual(m.group(), b'abcdefgh')
|
||||
self.assertEqual(m2.group(), b'efgh')
|
||||
s[:] = b'xyz'
|
||||
self.assertEqual(m.group(), b'xyz')
|
||||
self.assertEqual(m2.group(), b'')
|
||||
|
||||
|
||||
class PatternReprTests(unittest.TestCase):
|
||||
def check(self, pattern, expected):
|
||||
|
@ -55,6 +55,9 @@ Extension Modules
|
||||
Library
|
||||
-------
|
||||
|
||||
- Issue #29444: Fixed out-of-bounds buffer access in the group() method of
|
||||
the match object. Based on patch by WGH.
|
||||
|
||||
- Issue #29335: Fix subprocess.Popen.wait() when the child process has
|
||||
exited to a stopped instead of terminated state (ex: when under ptrace).
|
||||
|
||||
|
@ -2003,6 +2003,7 @@ match_getslice_by_index(MatchObject* self, Py_ssize_t index, PyObject* def)
|
||||
Py_buffer view;
|
||||
PyObject *result;
|
||||
void* ptr;
|
||||
Py_ssize_t i, j;
|
||||
|
||||
if (index < 0 || index >= self->groups) {
|
||||
/* raise IndexError if we were given a bad group number */
|
||||
@ -2024,8 +2025,12 @@ match_getslice_by_index(MatchObject* self, Py_ssize_t index, PyObject* def)
|
||||
ptr = getstring(self->string, &length, &isbytes, &charsize, &view);
|
||||
if (ptr == NULL)
|
||||
return NULL;
|
||||
result = getslice(isbytes, ptr,
|
||||
self->string, self->mark[index], self->mark[index+1]);
|
||||
|
||||
i = self->mark[index];
|
||||
j = self->mark[index+1];
|
||||
i = Py_MIN(i, length);
|
||||
j = Py_MIN(j, length);
|
||||
result = getslice(isbytes, ptr, self->string, i, j);
|
||||
if (isbytes && view.buf != NULL)
|
||||
PyBuffer_Release(&view);
|
||||
return result;
|
||||
|
Loading…
Reference in New Issue
Block a user