Skip to content
Merged
Changes from 1 commit
Commits
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
Next Next commit
Merge remote-tracking branch 'upstream/main' into fix/ubsan/sha-111178
  • Loading branch information
picnixz committed Jan 14, 2025
commit 494565a8ddbf15e67e814a50251dc46582d779d1
10 changes: 7 additions & 3 deletions Modules/blake2module.c
Original file line number Diff line number Diff line change
Expand Up @@ -899,10 +899,14 @@ static PyGetSetDef py_blake2b_getsetters[] = {
};


static void
py_blake2b_dealloc(PyObject *op)
static int
py_blake2_clear(PyObject *op)
{
Blake2Object *self = _Blake2Object_CAST(op);
Blake2Object *self = (Blake2Object *)op;
// The initialization function uses PyObject_GC_New() but explicitly
// initializes the HACL* internal state to NULL before allocating
// it. If an error occurs in the constructor, we should only free
// states that were allocated (i.e. that are not NULL).
switch (self->impl) {
#if HACL_CAN_COMPILE_SIMD256
case Blake2b_256:
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.