Thanks to visit codestin.com
Credit goes to github.com

Skip to content

FIX: guard second usage of PyWeakref_GetObject #934

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
swt2c merged 4 commits into from
Feb 7, 2026
+38 −11
Merged

FIX: guard second usage of PyWeakref_GetObject #934

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21bb17d
FIX: guard second usage of PyWeakref_GetObject
tacaswell Jan 28, 2026
12be081
MNT: Handle NULL / dead case in 3.13+ code path correctly
tacaswell Jan 29, 2026
6a06910
MNT: further simplify handling the both old and new code paths
tacaswell Jan 30, 2026
434b7b5
MNT: let weakref errors propogate up and out
tacaswell Feb 6, 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
49 changes: 38 additions & 11 deletions src/share.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,29 +262,53 @@ share_cleanup_and_count_live_easies(CurlShareObject *self)

if (it && to_remove) {
PyObject *wr;
PyObject *obj = NULL;

while ((wr = PyIter_Next(it))) {
PyObject *obj = PyWeakref_GetObject(wr);
#if PY_VERSION_HEX >= 0x030D0000 /* Python 3.13+ */
int rc = PyWeakref_GetRef(wr, &obj);
// return -1 on error, 0 on dead object
// in either case, mark as removable and
// move to the next reference
if (rc < 0) {
Py_DECREF(wr);
return -1;
} else if (rc == 0 || obj == NULL) {
PyList_Append(to_remove, wr);
Py_DECREF(wr);
continue;
}

#else
// will borrowed reference, None if object dead
obj = PyWeakref_GetObject(wr);
if (obj != Py_None) {
Comment thread
tacaswell marked this conversation as resolved.
CurlObject *easy = (CurlObject *)obj;
// If not None, real object, INCREF and carry on
Py_INCREF(obj);
} else {
// otherwise mark for removal and move to the next ref
PyList_Append(to_remove, wr);
Py_DECREF(wr);
continue;
}
#endif
CurlObject *easy = (CurlObject *)obj;

if (easy && easy->share == self) {
if (self->detach_on_close) {
curl_easy_setopt(easy->handle, CURLOPT_SHARE, NULL);
easy->share = NULL;
if (easy && easy->share == self) {
if (self->detach_on_close) {
curl_easy_setopt(easy->handle, CURLOPT_SHARE, NULL);
easy->share = NULL;

PyList_Append(to_remove, wr);
} else {
has_live += 1;
}
} else {
PyList_Append(to_remove, wr);
} else {
has_live += 1;
}
} else {
PyList_Append(to_remove, wr);
}

Py_DECREF(wr);
Py_DECREF(obj);
Comment thread
tacaswell marked this conversation as resolved.
}

Py_ssize_t i, n = PyList_GET_SIZE(to_remove);
Expand Down Expand Up @@ -329,6 +353,9 @@ do_share_close(CurlShareObject *self, PyObject *Py_UNUSED(ignored))
(nlive == 1 ? "" : "s")
);
return NULL;
} else if (nlive < 0) {
// Error in share_cleanup_and_count_live_easies, propagate up
return NULL;
}

util_share_close(self);
Expand Down