mirror of
https://github.com/python/cpython.git
synced 2025-07-07 19:35:27 +00:00
[3.12] gh-130775: Allow negative locations in ast
(GH-130795) (#132260)
(cherry picked from commit bc5233b6a5
)
Co-authored-by: sobolevn <mail@sobolevn.me>
Co-authored-by: Victor Stinner <vstinner@python.org>
This commit is contained in:
parent
40f81e1060
commit
492a554cfc
3 changed files with 20 additions and 4 deletions
|
@ -160,6 +160,23 @@ class AST_Tests(unittest.TestCase):
|
|||
# Check that compilation doesn't crash. Note: this may crash explicitly only on debug mode.
|
||||
compile(tree, "<string>", "exec")
|
||||
|
||||
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 (
|
||||
{'lineno': -2, 'col_offset': 0},
|
||||
{'lineno': 0, 'col_offset': -2},
|
||||
{'lineno': 0, 'col_offset': -2, 'end_col_offset': -2},
|
||||
{'lineno': -2, 'end_lineno': -2, 'col_offset': 0},
|
||||
):
|
||||
with self.subTest(attrs=attrs):
|
||||
tree = ast.Module(body=[
|
||||
ast.Import(names=[alias], **attrs)
|
||||
], type_ignores=[])
|
||||
|
||||
# It used to crash on this step:
|
||||
compile(tree, "<string>", "exec")
|
||||
|
||||
def test_slice(self):
|
||||
slc = ast.parse("x[::]").body[0].value.slice
|
||||
self.assertIsNone(slc.upper)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Do not crash on negative ``column`` and ``end_column`` in :mod:`ast` locations.
|
|
@ -268,17 +268,15 @@ write_location_info_entry(struct assembler* a, location loc, int isize)
|
|||
assert(len > THEORETICAL_MAX_ENTRY_SIZE);
|
||||
RETURN_IF_ERROR(_PyBytes_Resize(&a->a_linetable, len*2));
|
||||
}
|
||||
if (loc.lineno < 0) {
|
||||
if (loc.lineno == NO_LOCATION.lineno) {
|
||||
write_location_info_none(a, isize);
|
||||
return SUCCESS;
|
||||
}
|
||||
int line_delta = loc.lineno - a->a_lineno;
|
||||
int column = loc.col_offset;
|
||||
int end_column = loc.end_col_offset;
|
||||
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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue