From: Nikita Sobolev <mail@sobolevn.me>
Date: Tue, 10 Oct 2023 10:15:12 +0000 (+0300)
Subject: gh-110590: Fix a bug where _sre.compile would overwrite exceptions (#110591)
X-Git-Tag: v3.13.0a1~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=344d3a222a7864f8157773749bdd77d1c9dfc1e6;p=thirdparty%2FPython%2Fcpython.git

gh-110590: Fix a bug where _sre.compile would overwrite exceptions (#110591)

TypeError would be overwritten by OverflowError
if 'code' param contained non-ints.
---

diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index 45bce1925f9e..301d4a516568 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -2735,6 +2735,9 @@ class ImplementationTest(unittest.TestCase):
             _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):
diff --git a/Misc/NEWS.d/next/Library/2023-10-10-10-46-55.gh-issue-110590.fatz-h.rst b/Misc/NEWS.d/next/Library/2023-10-10-10-46-55.gh-issue-110590.fatz-h.rst
new file mode 100644
index 000000000000..20dc3fff2059
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-10-10-10-46-55.gh-issue-110590.fatz-h.rst
@@ -0,0 +1,3 @@
+Fix a bug in :meth:`!_sre.compile` where :exc:`TypeError`
+would be overwritten by :exc:`OverflowError` when
+the *code* argument was a list of non-ints.
diff --git a/Modules/_sre/sre.c b/Modules/_sre/sre.c
index 07da5da13f70..798732ccddc9 100644
--- a/Modules/_sre/sre.c
+++ b/Modules/_sre/sre.c
@@ -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,