Commite6c3039

authored

gh-135410: use a critical section aroundStringIO.__next__ (#135412)

1 parentd447129 commite6c3039Copy full SHA for e6c3039

File tree

+32

-1

lines changed

+32

-1

lines changed

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,15 @@`
`5`	`5`
`6`	`6`	`importunittest`
`7`	`7`	`fromtestimportsupport`
	`8`	`+fromtest.supportimportthreading_helper`
`8`	`9`
`9`	`10`	`importgc`
`10`	`11`	`importio`
`11`	`12`	`import_pyioaspyio`
`12`	`13`	`importpickle`
`13`	`14`	`importsys`
`14`	`15`	`importweakref`
	`16`	`+importthreading`
`15`	`17`
`16`	`18`	`classIntLike:`
`17`	`19`	`def__init__(self,num):`
`@@ -723,6 +725,22 @@ def test_newline_argument(self):`
`723`	`725`	`fornewlinein (None,"","\n","\r","\r\n"):`
`724`	`726`	`self.ioclass(newline=newline)`
`725`	`727`
	`728`	`+@unittest.skipUnless(support.Py_GIL_DISABLED,"only meaningful under free-threading")`
	`729`	`+@threading_helper.requires_working_threading()`
	`730`	`+deftest_concurrent_use(self):`
	`731`	`+memio=self.ioclass("")`
	`732`	`+`
	`733`	`+defuse():`
	`734`	`+memio.write("x"*10)`
	`735`	`+memio.readlines()`
	`736`	`+`
	`737`	`+threads= [threading.Thread(target=use)for_inrange(8)]`
	`738`	`+withthreading_helper.catch_threading_exception()ascm:`
	`739`	`+withthreading_helper.start_threads(threads):`
	`740`	`+pass`
	`741`	`+`
	`742`	`+self.assertIsNone(cm.exc_value)`
	`743`	`+`
`726`	`744`
`727`	`745`	`classPyStringIOTest(MemoryTestMixin,MemorySeekTestMixin,`
`728`	`746`	`TextIOTestMixin,unittest.TestCase):`
`@@ -890,6 +908,7 @@ def test_setstate(self):`
`890`	`908`	`self.assertRaises(ValueError,memio.__setstate__, ("closed","",0,None))`
`891`	`909`
`892`	`910`
	`911`	`+`
`893`	`912`	`classCStringIOPickleTest(PyStringIOPickleTest):`
`894`	`913`	`UnsupportedOperation=io.UnsupportedOperation`
`895`	`914`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix a crash when iterating over:class:`io.StringIO` on the:term:`free
	`2`	+threaded <free threading>` build.

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ _io_StringIO_readline_impl(stringio *self, Py_ssize_t size)`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`staticPyObject*`
`407`		`-stringio_iternext(PyObject*op)`
	`407`	`+stringio_iternext_lock_held(PyObject*op)`
`408`	`408`	`{`
`409`	`409`	`PyObject*line;`
`410`	`410`	`stringio*self=stringio_CAST(op);`
`@@ -441,6 +441,16 @@ stringio_iternext(PyObject *op)`
`441`	`441`	`returnline;`
`442`	`442`	`}`
`443`	`443`
	`444`	`+staticPyObject*`
	`445`	`+stringio_iternext(PyObject*op)`
	`446`	`+{`
	`447`	`+PyObject*res;`
	`448`	`+Py_BEGIN_CRITICAL_SECTION(op);`
	`449`	`+res=stringio_iternext_lock_held(op);`
	`450`	`+Py_END_CRITICAL_SECTION();`
	`451`	`+returnres;`
	`452`	`+}`
	`453`	`+`
`444`	`454`	`/*[clinic input]`
`445`	`455`	`@critical_section`
`446`	`456`	`_io.StringIO.truncate`

Comments

(0)