Skip to content

gh-130775: Allow negative locations in ast #130795

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

Merged
sobolevn merged 5 commits into from
Apr 7, 2025
Merged

gh-130775: Allow negative locations in ast #130795

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd105a8
gh-130775: Validate negative locations in `ast`
sobolevn Mar 3, 2025
9d2037e
Update Python/ast.c
sobolevn Mar 3, 2025
1427c57
Address reviews
sobolevn Mar 13, 2025
97f4efb
Merge branch 'main' into issue-130775
sobolevn Mar 13, 2025
8f3e1a9
Fix tests
sobolevn Mar 13, 2025
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
Prev Previous commit
Next Next commit
Address reviews
  • Loading branch information
@sobolevn
sobolevn committed Mar 13, 2025
commit 1427c571e6aa47ad5452837c3e995ede0d254ee7
11 changes: 5 additions & 6 deletions Lib/test/test_ast/test_ast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def test_compilation_of_ast_nodes_with_default_end_position_values(self):
# Check that compilation doesn't crash. Note: this may crash explicitly only on debug mode.
compile(tree, "<string>", "exec")

def test_compilation_of_ast_nodes_with_negative_position_values(self):
def test_negative_locations_for_compile(self):
# See https://github.com/python/cpython/issues/130775
alias = ast.alias(name='traceback', lineno=0, col_offset=0)
for attrs in (
Expand All @@ -219,11 +219,10 @@ def test_compilation_of_ast_nodes_with_negative_position_values(self):
], type_ignores=[])

# It used to crash on this step:
with self.assertRaisesRegex(
ValueError,
'AST node has invalid location',
):
compile(tree, "<string>", "exec")
compile(tree, "<string>", "exec")

# This also must not crash:
ast.parse(tree, optimize=2)

def test_slice(self):
slc = ast.parse("x[::]").body[0].value.slice
Expand Down
3 changes: 1 addition & 2 deletions Misc/NEWS.d/next/Core_and_Builtins/2025-03-03-20-02-45.gh-issue-130775.fEM6T-.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
Validate negative :mod:`ast` locations, we only allow ``-1`` as a special
value.
Do not crash on negative ``column`` and ``end_column`` in :mod:`ast` locations.
5 changes: 1 addition & 4 deletions Python/assemble.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,8 @@ write_location_info_entry(struct assembler* a, location loc, int isize)
int line_delta = loc.lineno - a->a_lineno;
int column = loc.col_offset;
int end_column = loc.end_col_offset;
// Values are validated in `VALIDATE_POSITIONS` in `ast.c`:
assert(column >= -1);
assert(end_column >= -1);
if (column < 0 || end_column < 0) {
if (loc.end_lineno == loc.lineno || loc.end_lineno == -1) {
if (loc.end_lineno == loc.lineno || loc.end_lineno < 0) {
write_location_info_no_column(a, isize, line_delta);
a->a_lineno = loc.lineno;
return SUCCESS;
Expand Down
9 changes: 0 additions & 9 deletions Python/ast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,6 @@ static int validate_typeparam(type_param_ty);
node->col_offset, node->end_col_offset, node->lineno, node->end_lineno); \
return 0; \
} \
if (node->lineno < -1 || node->end_lineno < -1 || \
node->col_offset < -1 || node->end_col_offset < -1) { \
PyErr_Format(PyExc_ValueError, \
"AST node has invalid location: lineno=%d, end_lineno=%d, " \
"col_offset=%d, end_col_offset=%d", \
node->lineno, node->end_lineno, \
node->col_offset, node->end_col_offset); \
return 0; \
} \
if (node->lineno == node->end_lineno && node->col_offset > node->end_col_offset) { \
PyErr_Format(PyExc_ValueError, \
"line %d, column %d-%d is not a valid range", \
Expand Down
Loading