mirror of
https://github.com/python/cpython.git
synced 2025-09-26 10:19:53 +00:00
[3.12] gh-109894: Fix initialization of static MemoryError
in subinterpreter (gh-110911) (gh-111238)
Fixes GH-109894
* set `interp.static_objects.last_resort_memory_error.args` to empty tuple to avoid crash on `PyErr_Display()` call
* allow `_PyExc_InitGlobalObjects()` to be called on subinterpreter init
---------
(cherry picked from commit 47d3e2ed93
)
Co-authored-by: Radislav Chugunov <52372310+chgnrdv@users.noreply.github.com>
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
This commit is contained in:
parent
1e1a30f9f4
commit
0aceac557d
4 changed files with 16 additions and 4 deletions
|
@ -119,6 +119,7 @@ extern PyTypeObject _PyExc_MemoryError;
|
|||
}, \
|
||||
.last_resort_memory_error = { \
|
||||
_PyObject_HEAD_INIT(&_PyExc_MemoryError) \
|
||||
.args = (PyObject*)&_Py_SINGLETON(tuple_empty) \
|
||||
}, \
|
||||
}, \
|
||||
}, \
|
||||
|
|
|
@ -1785,6 +1785,20 @@ class ExceptionTests(unittest.TestCase):
|
|||
|
||||
gc_collect()
|
||||
|
||||
def test_memory_error_in_subinterp(self):
|
||||
# gh-109894: subinterpreters shouldn't count on last resort memory error
|
||||
# when MemoryError is raised through PyErr_NoMemory() call,
|
||||
# and should preallocate memory errors as does the main interpreter.
|
||||
# interp.static_objects.last_resort_memory_error.args
|
||||
# should be initialized to empty tuple to avoid crash on attempt to print it.
|
||||
code = f"""if 1:
|
||||
import _testcapi
|
||||
_testcapi.run_in_subinterp(\"[0]*{sys.maxsize}\")
|
||||
exit(0)
|
||||
"""
|
||||
rc, _, err = script_helper.assert_python_ok("-c", code)
|
||||
self.assertIn(b'MemoryError', err)
|
||||
|
||||
|
||||
class NameErrorTests(unittest.TestCase):
|
||||
def test_name_error_has_name(self):
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Fixed crash due to improperly initialized static :exc:`MemoryError` in subinterpreter.
|
|
@ -3701,10 +3701,6 @@ _PyExc_FiniTypes(PyInterpreterState *interp)
|
|||
PyStatus
|
||||
_PyExc_InitGlobalObjects(PyInterpreterState *interp)
|
||||
{
|
||||
if (!_Py_IsMainInterpreter(interp)) {
|
||||
return _PyStatus_OK();
|
||||
}
|
||||
|
||||
if (preallocate_memerrors() < 0) {
|
||||
return _PyStatus_NO_MEMORY();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue