Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-107450: Raise OverflowError when parser column offset overflows (#110754)

This commit is contained in:
Lysandros Nikolaou 2023-10-12 11:34:12 +02:00 committed by GitHub
parent 3d180347ae
commit fb7843ee89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_exceptions.py
View File

@ -318,6 +318,10 @@ class ExceptionTests(unittest.TestCase):
check('(yield i) = 2', 1, 2) check('(yield i) = 2', 1, 2)
check('def f(*):\n pass', 1, 7) 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 @cpython_only
def testSettingException(self): def testSettingException(self):
# test that setting an exception at the C level works even if the # test that setting an exception at the C level works even if the

6
Parser/pegen_errors.c
View File

@ -235,6 +235,12 @@ _PyPegen_raise_error(Parser *p, PyObject *errtype, int use_mark, const char *err
col_offset = 0; col_offset = 0;
} else { } else {
const char* start = p->tok->buf ? p->tok->line_start : p->tok->buf; 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); col_offset = Py_SAFE_DOWNCAST(p->tok->cur - start, intptr_t, int);
} }
} else { } else {