]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-107450: Raise OverflowError when parser column offset overflows (GH-110754...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Thu, 12 Oct 2023 10:03:09 +0000 (12:03 +0200)
committerGitHub <noreply@github.com>
Thu, 12 Oct 2023 10:03:09 +0000 (10:03 +0000)
(cherry picked from commit fb7843ee895ac7f6eeb58f356b1a320eea081cfc)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
Lib/test/test_exceptions.py
Parser/pegen_errors.c

index 72afb3b0fb03f8984eeb594d917fdf9330fb13c2..5d460982ddfa4897bbf2869304eaca3c3201f820 100644 (file)
@@ -318,6 +318,10 @@ class ExceptionTests(unittest.TestCase):
         check('(yield i) = 2', 1, 2)
         check('def f(*):\n  pass', 1, 7)
 
+    def testMemoryErrorBigSource(self):
+        with self.assertRaisesRegex(OverflowError, "column offset overflow"):
+            exec(f"if True:\n {' ' * 2**31}print('hello world')")
+
     @cpython_only
     def testSettingException(self):
         # test that setting an exception at the C level works even if the
index cbeb9da04d92d80e7b15be5483eedb89c25b12d3..71c476517375bbe6976ddb76426205aab427681c 100644 (file)
@@ -233,6 +233,12 @@ _PyPegen_raise_error(Parser *p, PyObject *errtype, int use_mark, const char *err
             col_offset = 0;
         } else {
             const char* start = p->tok->buf  ? p->tok->line_start : p->tok->buf;
+            if (p->tok->cur - start > INT_MAX) {
+                PyErr_SetString(PyExc_OverflowError,
+                    "Parser column offset overflow - source line is too big");
+                p->error_indicator = 1;
+                return NULL;
+            }
             col_offset = Py_SAFE_DOWNCAST(p->tok->cur - start, intptr_t, int);
         }
     } else {