mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-28 11:15:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-116099: Fix refcounting bug in _queueobj_shared() (gh-116164)

Browse source 
This code decrefs `qidobj` twice in some paths. Since `qidobj` isn't used after
the first `Py_DECREF()`, remove the others, and replace the `Py_DECREF()` with
`Py_CLEAR()` to make it clear that the variable is dead.

With this fix, `python -mtest test_interpreters -R 3:3 -mtest_queues` no longer
fails with `_Py_NegativeRefcount: Assertion failed: object has negative ref
count`.
This commit is contained in:
Brett Simmers 2024-02-29 17:02:12 -08:00 • committed by GitHub
parent d7ddd90308
commit 2e94a6687c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/_xxinterpqueuesmodule.c
View file

@ -1189,7 +1189,7 @@ _queueobj_shared(PyThreadState *tstate, PyObject *queueobj,
.label = "queue ID", .label = "queue ID",
}; };
int res = idarg_int64_converter(qidobj, &converted); int res = idarg_int64_converter(qidobj, &converted);
Py_DECREF(qidobj); Py_CLEAR(qidobj);
if (!res) { if (!res) {
assert(PyErr_Occurred()); assert(PyErr_Occurred());
return -1; return -1;
@ -1197,12 +1197,10 @@ _queueobj_shared(PyThreadState *tstate, PyObject *queueobj,
void *raw = _queueid_xid_new(converted.id); void *raw = _queueid_xid_new(converted.id);
if (raw == NULL) { if (raw == NULL) {
Py_DECREF(qidobj);
return -1; return -1;
} }
_PyCrossInterpreterData_Init(data, tstate->interp, raw, NULL, _PyCrossInterpreterData_Init(data, tstate->interp, raw, NULL,
_queueobj_from_xid); _queueobj_from_xid);
Py_DECREF(qidobj);
_PyCrossInterpreterData_SET_FREE(data, _queueid_xid_free); _PyCrossInterpreterData_SET_FREE(data, _queueid_xid_free);
return 0; return 0;
} }