Skip to content

gh-151126: Fix missing memory errors in _interpqueuesmodule.c #151639

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

Open
lpyu001 wants to merge 6 commits into
base: main
Choose a base branch
from
+18 −2
Open

gh-151126: Fix missing memory errors in _interpqueuesmodule.c #151639

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
aa5ed69
Fix missing memory errors in _interpqueuesmodule.c
lpyu001 Jun 18, 2026
250808b
Update _interpqueuesmodule.c
lpyu001 Jun 25, 2026
d44c061
Address review comments
lpyu001 Jun 25, 2026
18bcd81
updates NEWS
lpyu001 Sep 9, 2026
29656c2
UP
lpyu001 Sep 9, 2026
1ad99bb
up
lpyu001 Sep 9, 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-18-17-31-02.gh-issue-151126.HubUYi.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix missing error handling in interpreter queues when listing queues or sharing a queue between interpreters.
Memory allocation failures now raise :exc:`MemoryError` instead of returning without an exception set.
18 changes: 16 additions & 2 deletions Modules/_interpqueuesmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,9 +1042,10 @@ _queues_list_all(_queues *queues, int64_t *p_count)
{
struct queue_id_and_info *qids = NULL;
PyThread_acquire_lock(queues->mutex, WAIT_LOCK);
struct queue_id_and_info *ids = PyMem_NEW(struct queue_id_and_info,
struct queue_id_and_info *ids = PyMem_New(struct queue_id_and_info,
(Py_ssize_t)(queues->count));
if (ids == NULL) {
PyErr_NoMemory();
goto done;
}
_queueref *ref = queues->head;
Expand Down Expand Up @@ -1321,13 +1322,26 @@ static void *
_queueid_xid_new(int64_t qid)
{
_queues *queues = _get_global_queues();
if (_queues_incref(queues, qid) < 0) {
int err = _queues_incref(queues, qid);
if (err < 0) {
assert(err == ERR_QUEUE_NOT_FOUND);
PyObject *mod = _get_current_module();
if (mod == NULL) {
if (!PyErr_Occurred()) {
PyErr_SetString(PyExc_SystemError,
"missing " MODULE_NAME_STR " module");
}
return NULL;
}
(void)handle_queue_error(err, mod, qid);
Py_DECREF(mod);
return NULL;
}

struct _queueid_xid *data = PyMem_RawMalloc(sizeof(struct _queueid_xid));
if (data == NULL) {
_queues_decref(queues, qid);
PyErr_NoMemory();
return NULL;
}
data->qid = qid;
Expand Down
Loading