Commitb50b6f9

and

authored

[3.8]gh-87604: Avoid publishing list of active per-interpreter audit hooks via the gc module (GH-99373) (GH-99661)

(cherry picked from commit7b98207)Co-authored-by: Steve Dower <steve.dower@python.org>

1 parent82ca283 commitb50b6f9Copy full SHA for b50b6f9

File tree

+20

-0

lines changed

+20

-0

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -341,6 +341,17 @@ def hook(event, args):`
`341`	`341`	`gc.get_referents(y)`
`342`	`342`
`343`	`343`
	`344`	`+deftest_not_in_gc():`
	`345`	`+importgc`
	`346`	`+`
	`347`	`+hook=lambda*a:None`
	`348`	`+sys.addaudithook(hook)`
	`349`	`+`
	`350`	`+foroingc.get_objects():`
	`351`	`+ifisinstance(o,list):`
	`352`	`+asserthooknotino`
	`353`	`+`
	`354`	`+`
`344`	`355`	`if__name__=="__main__":`
`345`	`356`	`fromtest.supportimportsuppress_msvcrt_asserts`
`346`	`357`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,11 @@ def test_gc(self):`
`127`	`127`	`["gc.get_objects","gc.get_referrers","gc.get_referents"]`
`128`	`128`	`)`
`129`	`129`
	`130`	`+deftest_not_in_gc(self):`
	`131`	`+returncode,_,stderr=self.run_python("test_not_in_gc")`
	`132`	`+ifreturncode:`
	`133`	`+self.fail(stderr)`
	`134`	`+`
`130`	`135`
`131`	`136`	`if__name__=="__main__":`
`132`	`137`	`unittest.main()`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Avoid publishing list of active per-interpreter audit hooks via the`
	`2`	+:mod:`gc` module

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,8 @@ sys_addaudithook_impl(PyObject module, PyObject hook)`
`356`	`356`	`if (is->audit_hooks==NULL) {`
`357`	`357`	`returnNULL;`
`358`	`358`	`}`
	`359`	`+/* Avoid having our list of hooks show up in the GC module */`
	`360`	`+PyObject_GC_UnTrack(is->audit_hooks);`
`359`	`361`	`}`
`360`	`362`
`361`	`363`	`if (PyList_Append(is->audit_hooks,hook)<0) {`

Comments

(0)