]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-149921: Fix reference leaks in _interpchannels and _interpqueues modules (#149922) 149613/head
authorAN Long <aisk@users.noreply.github.com>
Sun, 17 May 2026 10:09:19 +0000 (19:09 +0900)
committerGitHub <noreply@github.com>
Sun, 17 May 2026 10:09:19 +0000 (13:09 +0300)
Misc/NEWS.d/next/Library/2026-05-16-21-08-33.gh-issue-149921.I1yNML.rst [new file with mode: 0644]
Modules/_interpchannelsmodule.c
Modules/_interpqueuesmodule.c

diff --git a/Misc/NEWS.d/next/Library/2026-05-16-21-08-33.gh-issue-149921.I1yNML.rst b/Misc/NEWS.d/next/Library/2026-05-16-21-08-33.gh-issue-149921.I1yNML.rst
new file mode 100644 (file)
index 0000000..113bd1a
--- /dev/null
@@ -0,0 +1,2 @@
+Fix reference leaks in error paths of the :mod:`!_interpchannels` and
+:mod:`!_interpqueues` extension modules.
index 3c356cb40d2bca6e3f156deb30e4fbedc56e1b00..c6d107d243dda0e2b3f075f86b3cf366be34ae3b 100644 (file)
@@ -2586,6 +2586,7 @@ static PyObject *
 _channelid_from_xid(_PyXIData_t *data)
 {
     struct _channelid_xid *xid = (struct _channelid_xid *)_PyXIData_DATA(data);
+    PyObject *cidobj = NULL;
 
     // It might not be imported yet, so we can't use _get_current_module().
     PyObject *mod = PyImport_ImportModule(MODULE_NAME_STR);
@@ -2595,11 +2596,10 @@ _channelid_from_xid(_PyXIData_t *data)
     assert(mod != Py_None);
     module_state *state = get_module_state(mod);
     if (state == NULL) {
-        return NULL;
+        goto done;
     }
 
     // Note that we do not preserve the "resolve" flag.
-    PyObject *cidobj = NULL;
     int err = newchannelid(state->ChannelIDType, xid->cid, xid->end,
                            _global_channels(), 0, 0,
                            (channelid **)&cidobj);
index 777b68547498847927f181e7864d872dfde92a06..b23aa5f39489d9805f23bcda67e275587e77911d 100644 (file)
@@ -1363,6 +1363,7 @@ _queueobj_from_xid(_PyXIData_t *data)
     if (mod == NULL) {
         mod = PyImport_ImportModule(MODULE_NAME_STR);
         if (mod == NULL) {
+            Py_DECREF(qidobj);
             return NULL;
         }
     }