Skip to content

bpo-23689: re module, fix memory leak when a match is terminated by a signal or memory allocation failure #32283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 11 commits into from Apr 3, 2022
Merged

bpo-23689: re module, fix memory leak when a match is terminated by a signal or memory allocation failure #32283

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e5317fe
1. add variables
wjssz Apr 3, 2022
28e4d2d
2. add _CompileData class to _compile.py
wjssz Apr 3, 2022
7493fad
3. add repeat_count parameter to _sre.compile() function
wjssz Apr 3, 2022
b928335
4. emit repeat_count in sre_compile.py
wjssz Apr 3, 2022
dfec05d
5. change _validate_outer() parameter
wjssz Apr 3, 2022
db7e88b
6. validate in _validate_inner() / _validate_outer()
wjssz Apr 3, 2022
a43cb6e
7. allocate repeats_array for SRE_STATE
wjssz Apr 3, 2022
1560a0c
8. support code in sre_lib.h
wjssz Apr 3, 2022
96be025
9. add unit-tests
wjssz Apr 3, 2022
7ee3e66
a. skip -= field_number
wjssz Apr 3, 2022
e95b19f
b. improve unit-test
wjssz Apr 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
6. validate in _validate_inner() / _validate_outer()
  • Loading branch information
@wjssz
wjssz committed Apr 3, 2022
commit db7e88b2af63d60b3bab3728e0a72a280331d02c
17 changes: 13 additions & 4 deletions Modules/_sre.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,8 +1473,8 @@ _sre_compile_impl(PyObject *module, PyObject *pattern, int flags,
self->pattern = pattern;

self->flags = flags;

self->groups = groups;
self->repeat_count = repeat_count;

if (PyDict_GET_SIZE(groupindex) > 0) {
Py_INCREF(groupindex);
Expand Down Expand Up @@ -1838,17 +1838,25 @@ _validate_inner(SRE_CODE *code, SRE_CODE *end, PatternObject *self)
case SRE_OP_REPEAT:
case SRE_OP_POSSESSIVE_REPEAT:
{
SRE_CODE op1 = op, min, max;
SRE_CODE op1 = op, min, max, repeat_index, _fields;
GET_SKIP;
GET_ARG; min = arg;
GET_ARG; max = arg;
if (min > max)
FAIL;
if (max > SRE_MAXREPEAT)
FAIL;
if (!_validate_inner(code, code+skip-3, self))
if (op1 == SRE_OP_REPEAT) {
GET_ARG; repeat_index = arg;
if (repeat_index >= (size_t)self->repeat_count)
FAIL;
_fields = 4;
Comment thread
This conversation was marked as resolved.
Outdated
} else {
_fields = 3;
}
if (!_validate_inner(code, code+skip-_fields, self))
FAIL;
code += skip-3;
code += skip-_fields;
GET_OP;
if (op1 == SRE_OP_POSSESSIVE_REPEAT) {
if (op != SRE_OP_SUCCESS)
Expand Down Expand Up @@ -1966,6 +1974,7 @@ static int
_validate_outer(SRE_CODE *code, SRE_CODE *end, PatternObject *self)
{
if (self->groups < 0 || (size_t)self->groups > SRE_MAXGROUPS ||
self->repeat_count < 0 ||
code >= end || end[-1] != SRE_OP_SUCCESS)
FAIL;
return _validate_inner(code, end-1, self);
Expand Down