Skip to content

gh-110590: Fix _sre.compile error overwrite #110591

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
merged 5 commits into from
Oct 10, 2023
Merged

gh-110590: Fix _sre.compile error overwrite #110591

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c829171
gh-110590: Fix `_sre.compile` error overwrite
sobolevn Oct 10, 2023
18cd5ed
Update 2023-10-10-10-46-55.gh-issue-110590.fatz-h.rst
sobolevn Oct 10, 2023
dc22745
Update 2023-10-10-10-46-55.gh-issue-110590.fatz-h.rst
sobolevn Oct 10, 2023
858fa3f
Update 2023-10-10-10-46-55.gh-issue-110590.fatz-h.rst
sobolevn Oct 10, 2023
cfb142e
Update Misc/NEWS.d/next/Library/2023-10-10-10-46-55.gh-issue-110590.f…
erlend-aasland Oct 10, 2023
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
3 changes: 3 additions & 0 deletions Lib/test/test_re.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2735,6 +2735,9 @@ def test_dealloc(self):
_sre.compile("abc", 0, [long_overflow], 0, {}, ())
with self.assertRaises(TypeError):
_sre.compile({}, 0, [], 0, [], [])
# gh-110590: `TypeError` was overwritten with `OverflowError`:
with self.assertRaises(TypeError):
_sre.compile('', 0, ['abc'], 0, {}, ())

@cpython_only
def test_repeat_minmax_overflow_maxrepeat(self):
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2023-10-10-10-46-55.gh-issue-110590.fatz-h.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix ``_sre.compile`` error overwriting ``TypeError``
with ``OverflowError`` when ``code`` argument
was a list of non-ints.
3 changes: 3 additions & 0 deletions Modules/_sre/sre.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,6 +1508,9 @@ _sre_compile_impl(PyObject *module, PyObject *pattern, int flags,
for (i = 0; i < n; i++) {
PyObject *o = PyList_GET_ITEM(code, i);
unsigned long value = PyLong_AsUnsignedLong(o);
if (value == (unsigned long)-1 && PyErr_Occurred()) {
break;
}
self->code[i] = (SRE_CODE) value;
if ((unsigned long) self->code[i] != value) {
PyErr_SetString(PyExc_OverflowError,
Expand Down