summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/test/test_exceptions.py4
-rw-r--r--Parser/pegen_errors.c6
2 files changed, 10 insertions, 0 deletions
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 05a89e7..bba2eeb 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -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
diff --git a/Parser/pegen_errors.c b/Parser/pegen_errors.c
index 2baae52..15e99e2 100644
--- a/Parser/pegen_errors.c
+++ b/Parser/pegen_errors.c
@@ -235,6 +235,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 {