Commitf64b60b

committed

gh-126105: Fix crash inast module, when._fields is deleted

1 parent9b14083 commitf64b60bCopy full SHA for f64b60b

File tree

+38

-16

lines changed

+38

-16

lines changed

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,23 @@ def test_AST_objects(self):`
`84`	`84`	`# "ast.AST constructor takes 0 positional arguments"`
`85`	`85`	`ast.AST(2)`
`86`	`86`
	`87`	`+deftest_AST_fields_NULL_check(self):`
	`88`	`+# See: https://github.com/python/cpython/issues/126105`
	`89`	`+old_value=ast.AST._fields`
	`90`	`+`
	`91`	`+defcleanup():`
	`92`	`+ast.AST._fields=old_value`
	`93`	`+self.addCleanup(cleanup)`
	`94`	`+`
	`95`	`+delast.AST._fields`
	`96`	`+`
	`97`	`+msg='AST has no fields'`
	`98`	`+# Both examples used to crash:`
	`99`	`+withself.assertRaisesRegex(TypeError,msg):`
	`100`	`+ast.AST(arg1=123)`
	`101`	`+withself.assertRaisesRegex(TypeError,msg):`
	`102`	`+ast.AST()`
	`103`	`+`
`87`	`104`	`deftest_AST_garbage_collection(self):`
`88`	`105`	`classX:`
`89`	`106`	`pass`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix a crash in:mod:`ast` when ``_fields`` attribute is deleted.

Lines changed: 10 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -887,16 +887,18 @@ def visitModule(self, mod):`
`887`	`887`	`if (PyObject_GetOptionalAttr((PyObject*)Py_TYPE(self), state->_fields, &fields) < 0) {`
`888`	`888`	`goto cleanup;`
`889`	`889`	`}`
`890`		`- if (fields) {`
`891`		`- numfields = PySequence_Size(fields);`
`892`		`- if (numfields == -1) {`
`893`		`- goto cleanup;`
`894`		`- }`
`895`		`- remaining_fields = PySet_New(fields);`
	`890`	`+ if (fields == NULL) {`
	`891`	`+ PyErr_Format(PyExc_TypeError,`
	`892`	`+ "%.400s has no fields",`
	`893`	`+ _PyType_Name(Py_TYPE(self)));`
	`894`	`+ goto cleanup;`
`896`	`895`	`}`
`897`		`- else {`
`898`		`- remaining_fields = PySet_New(NULL);`
	`896`	`+`
	`897`	`+ numfields = PySequence_Size(fields);`
	`898`	`+ if (numfields == -1) {`
	`899`	`+ goto cleanup;`
`899`	`900`	`}`
	`901`	`+ remaining_fields = PySet_New(fields);`
`900`	`902`	`if (remaining_fields == NULL) {`
`901`	`903`	`goto cleanup;`
`902`	`904`	`}`

Lines changed: 10 additions & 8 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Comments

(0)