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

Skip to content

gh-116946: fully implement GC protocol for _hashlib objects #138289

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
picnixz merged 3 commits into from
Sep 1, 2025
Merged

gh-116946: fully implement GC protocol for _hashlib objects #138289

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c79e13
fully implement GC protocol for `_hashlib` objects
picnixz Aug 31, 2025
119c19e
fix: `tp_traverse` is not inherited
picnixz Aug 31, 2025
23c4d91
smash diff
picnixz Aug 31, 2025
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
Prev Previous commit
smash diff
  • Loading branch information
@picnixz
picnixz committed Aug 31, 2025
commit 23c4d91e4ae9b47fdf20eaaab4c8d77fe40f7097
19 changes: 10 additions & 9 deletions Modules/_hashopenssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,9 @@ py_wrapper_EVP_MD_CTX_new(void)
static HASHobject *
new_hash_object(PyTypeObject *type)
{
HASHobject *retval = PyObject_GC_New(HASHobject, type);
assert(type != NULL);
assert(type->tp_alloc != NULL);
HASHobject *retval = (HASHobject *)type->tp_alloc(type, 0);
if (retval == NULL) {
return NULL;
}
Expand All @@ -764,7 +766,6 @@ new_hash_object(PyTypeObject *type)
return NULL;
}

PyObject_GC_Track(retval);
return retval;
}

Expand Down Expand Up @@ -797,7 +798,7 @@ _hashlib_HASH_dealloc(PyObject *op)
PyObject_GC_UnTrack(op);
HASHobject *self = HASHobject_CAST(op);
EVP_MD_CTX_free(self->ctx);
PyObject_GC_Del(self);
tp->tp_free(self);
Py_DECREF(tp);
}

Expand Down Expand Up @@ -1176,7 +1177,7 @@ PyDoc_STRVAR(HASHXOFobject_type_doc,
"digest_size -- number of bytes in this hashes output");

static PyType_Slot HASHXOFobject_type_slots[] = {
/* tp_dealloc is inherited from _hashlib.HASH */
{Py_tp_dealloc, _hashlib_HASH_dealloc},
{Py_tp_traverse, _hashlib_HASH_traverse},
{Py_tp_doc, (char *)HASHXOFobject_type_doc},
{Py_tp_methods, HASHXOFobject_methods},
Expand Down Expand Up @@ -1916,15 +1917,15 @@ _hashlib_hmac_new_impl(PyObject *module, Py_buffer *key, PyObject *msg_obj,
goto error;
}

self = PyObject_GC_New(HMACobject, state->HMAC_type);
assert(state->HMAC_type != NULL);
self = (HMACobject *)state->HMAC_type->tp_alloc(state->HMAC_type, 0);
if (self == NULL) {
goto error;
}

self->ctx = ctx;
ctx = NULL; // 'ctx' is now owned by 'self'
HASHLIB_INIT_MUTEX(self);
PyObject_GC_Track(self);

if ((msg_obj != NULL) && (msg_obj != Py_None)) {
if (!_hmac_update(self, msg_obj)) {
Expand Down Expand Up @@ -2023,15 +2024,15 @@ _hashlib_HMAC_copy_impl(HMACobject *self)
return NULL;
}

retval = PyObject_GC_New(HMACobject, Py_TYPE(self));
PyTypeObject *type = Py_TYPE(self);
retval = (HMACobject *)type->tp_alloc(type, 0);
if (retval == NULL) {
HMAC_CTX_free(ctx);
return NULL;
}
retval->ctx = ctx;
HASHLIB_INIT_MUTEX(retval);

PyObject_GC_Track(retval);
return (PyObject *)retval;
}

Expand All @@ -2045,7 +2046,7 @@ _hmac_dealloc(PyObject *op)
HMAC_CTX_free(self->ctx);
self->ctx = NULL;
}
PyObject_GC_Del(self);
tp->tp_free(self);
Py_DECREF(tp);
}

Expand Down
Loading