mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-05 00:11:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-33308: Fix a crash in the parser module when convert an ST object. (#6519)

Browse source 
Converting with line_info=False and col_info=True crashed before.
This commit is contained in:
Serhiy Storchaka 2018-04-19 01:55:37 +03:00 • committed by GitHub
parent c127a86e18
commit e5362eaa75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Lib/test/test_parser.py
View file

@ -322,21 +322,19 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase):
# An absolutely minimal test of position information. Better # An absolutely minimal test of position information. Better
# tests would be a big project. # tests would be a big project.
code = "def f(x):\n return x + 1" code = "def f(x):\n return x + 1"
st1 = parser.suite(code) st = parser.suite(code)
st2 = st1.totuple(line_info=1, col_info=1)
def walk(tree): def walk(tree):
node_type = tree[0] node_type = tree[0]
next = tree[1] next = tree[1]
if isinstance(next, tuple): if isinstance(next, (tuple, list)):
for elt in tree[1:]: for elt in tree[1:]:
for x in walk(elt): for x in walk(elt):
yield x yield x
else: else:
yield tree yield tree
terminals = list(walk(st2)) expected = [
self.assertEqual([
(1, 'def', 1, 0), (1, 'def', 1, 0),
(1, 'f', 1, 4), (1, 'f', 1, 4),
(7, '(', 1, 5), (7, '(', 1, 5),
@ -352,8 +350,25 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase):
(4, '', 2, 16), (4, '', 2, 16),
(6, '', 2, -1), (6, '', 2, -1),
(4, '', 2, -1), (4, '', 2, -1),
(0, '', 2, -1)], (0, '', 2, -1),
terminals) ]
self.assertEqual(list(walk(st.totuple(line_info=True, col_info=True))),
expected)
self.assertEqual(list(walk(st.totuple())),
[(t, n) for t, n, l, c in expected])
self.assertEqual(list(walk(st.totuple(line_info=True))),
[(t, n, l) for t, n, l, c in expected])
self.assertEqual(list(walk(st.totuple(col_info=True))),
[(t, n, c) for t, n, l, c in expected])
self.assertEqual(list(walk(st.tolist(line_info=True, col_info=True))),
[list(x) for x in expected])
self.assertEqual(list(walk(parser.st2tuple(st, line_info=True,
col_info=True))),
expected)
self.assertEqual(list(walk(parser.st2list(st, line_info=True,
col_info=True))),
[list(x) for x in expected])
def test_extended_unpacking(self): def test_extended_unpacking(self):
self.check_suite("*a = y") self.check_suite("*a = y")

2
Misc/NEWS.d/next/Library/2018-04-18-19-12-25.bpo-33308.fW75xi.rst Normal file
View file

@ -0,0 +1,2 @@
Fixed a crash in the :mod:`parser` module when converting an ST object to a
tree of tuples or lists with ``line_info=False`` and ``col_info=True``.

6
Modules/parsermodule.c
View file

@ -135,18 +135,18 @@ node2tuple(node *n, /* node to convert */
goto error; goto error;
(void) addelem(result, 1, w); (void) addelem(result, 1, w);
if (lineno == 1) { if (lineno) {
w = PyLong_FromLong(n->n_lineno); w = PyLong_FromLong(n->n_lineno);
if (w == NULL) if (w == NULL)
goto error; goto error;
(void) addelem(result, 2, w); (void) addelem(result, 2, w);
} }
if (col_offset == 1) { if (col_offset) {
w = PyLong_FromLong(n->n_col_offset); w = PyLong_FromLong(n->n_col_offset);
if (w == NULL) if (w == NULL)
goto error; goto error;
(void) addelem(result, 3, w); (void) addelem(result, 2 + lineno, w);
} }
} }
else { else {