Skip to content
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

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

Merged
merged 3 commits into from
Oct 12, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cd92ad
gh-107450: Raise MemoryError when parser column offset overflows
lysnikolaou Oct 12, 2023
5018678
Add test
lysnikolaou Oct 12, 2023
f87e527
Raise overflowerror instead of memoryerror
lysnikolaou Oct 12, 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
4 changes: 4 additions & 0 deletions Lib/test/test_exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,10 @@ def baz():
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
Expand Down
6 changes: 6 additions & 0 deletions Parser/pegen_errors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down