Skip to content

gh-152635: Raise MemoryError rather than fail assert() when the lock allocation fails in _interpchannels.create() #152642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sobolevn merged 6 commits into from
Jun 30, 2026
+6 −7
Merged

gh-152635: Raise MemoryError rather than fail assert() when the lock allocation fails in _interpchannels.create() #152642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c25ac11
Fix: gh-152635 _interpchannels channel lock alloc failure
stestagg Jun 29, 2026
b61a06f
Add @nomemtest decorator to the test, move the _testcapi call into th…
stestagg Jun 29, 2026
191f46a
self.assertRaises causes an allocation, so the _testcapi call
stestagg Jun 29, 2026
aeb50c0
Remove the test as it's not reliable enough, and testing allocation f…
stestagg Jun 30, 2026
b9182d3
Code review suggestions
stestagg Jun 30, 2026
25b178a
Remove the now-redundant (and incorrect) branch from
stestagg Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2026-06-29-23-29-14.gh-issue-152635.O21J0O.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a crash caused when running out of memory creating a
:mod:`!_interpchannels` channel. Now a :exc:`MemoryError` is correctly raised.
11 changes: 4 additions & 7 deletions Modules/_interpchannelsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ clear_module_state(module_state *state)
#define ERR_CHANNEL_INTERP_CLOSED -4
#define ERR_CHANNEL_EMPTY -5
#define ERR_CHANNEL_NOT_EMPTY -6
#define ERR_CHANNEL_MUTEX_INIT -7
#define ERR_CHANNEL_MUTEX_INIT -7 // currently unused
#define ERR_CHANNELS_MUTEX_INIT -8
#define ERR_NO_NEXT_CHANNEL_ID -9
#define ERR_CHANNEL_CLOSED_WAITING -10
Expand Down Expand Up @@ -427,10 +427,6 @@ handle_channel_error(int err, PyObject *mod, int64_t cid)
"if not empty (try force=True)",
cid);
}
else if (err == ERR_CHANNEL_MUTEX_INIT) {
PyErr_SetString(state->ChannelError,
Comment thread
stestagg marked this conversation as resolved.
"can't initialize mutex for new channel");
}
else if (err == ERR_CHANNELS_MUTEX_INIT) {
PyErr_SetString(state->ChannelError,
"can't initialize mutex for channel management");
Expand Down Expand Up @@ -1744,7 +1740,8 @@ channel_create(_channels *channels, struct _channeldefaults defaults)
{
PyThread_type_lock mutex = PyThread_allocate_lock();
if (mutex == NULL) {
return ERR_CHANNEL_MUTEX_INIT;
PyErr_NoMemory();
return -1;
}
_channel_state *chan = _channel_new(mutex, defaults);
if (chan == NULL) {
Expand Down Expand Up @@ -2938,7 +2935,7 @@ channelsmod_create(PyObject *self, PyObject *args, PyObject *kwds)

int64_t cid = channel_create(&_globals.channels, defaults);
if (cid < 0) {
(void)handle_channel_error(-1, self, cid);
(void)handle_channel_error(cid, self, cid);
return NULL;
}
module_state *state = get_module_state(self);
Expand Down
Loading