[PATCH 2/9] hash: add discard primitive
From: Jeff King <hidden>
Date: 2026-07-02 07:59:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
The usual life-cycle for a git_hash_ctx is calling git_hash_init(), adding some data, and then using git_hash_final() to get the output digest and free any resources. Sometimes we decide to abort the operation without the final() call (e.g., due to errors or other reasons). In that case we just abandon the hash_ctx completely and let it go out of scope. For most hash implementations this is fine; they were just holding values directly in the struct. But some implementations do allocate memory, and in these cases we leak the memory. Notably OpenSSL >= 3.0 requires us to allocate the digest context on the heap with EVP_MD_CTX_new(). Let's provide a git_hash_discard() function that can be used in these code paths to free any resources. For now we'll implement it by just calling git_hash_final() into a dummy output, relying on its side effect of freeing the resources. Our view of the underlying hash implementation is abstracted behind the platform_SHA_* macros, so that's the best we can do without widening that interface. It's a little inefficient, but probably not noticeably so in practice, especially as we'd usually hit this on an error code path. And by abstracting it in this function, we can later swap it out when the platform_SHA interface lets us do so. Signed-off-by: Jeff King <redacted> --- In case you're on the edge of your seat, that widening happens in patch 9. It was helpful to make sure the simple-and-stupid thing actually fixed the leaks first, and then do the convoluted platform-macro magic later. hash.c | 12 ++++++++++++ hash.h | 1 + 2 files changed, 13 insertions(+)
diff --git a/hash.c b/hash.c
index e925b9754e..63672a3d22 100644
--- a/hash.c
+++ b/hash.c@@ -283,6 +283,18 @@ void git_hash_final_oid(struct object_id *oid, struct git_hash_ctx *ctx) ctx->algop->final_oid_fn(oid, ctx); } +void git_hash_discard(struct git_hash_ctx *ctx) +{ + /* + * XXX Many implementations do not need to do anything here, + * and a dummy final() call is wasteful. But we can't fix + * that unless our implementation API exposes a discard + * primitive. + */ + unsigned char dummy[GIT_MAX_RAWSZ]; + git_hash_final(dummy, ctx); +} + uint32_t hash_algo_by_name(const char *name) { if (!name)
diff --git a/hash.h b/hash.h
index c082a53c9a..6b2f04e2a4 100644
--- a/hash.h
+++ b/hash.h@@ -325,6 +325,7 @@ void git_hash_clone(struct git_hash_ctx *dst, const struct git_hash_ctx *src); void git_hash_update(struct git_hash_ctx *ctx, const void *in, size_t len); void git_hash_final(unsigned char *hash, struct git_hash_ctx *ctx); void git_hash_final_oid(struct object_id *oid, struct git_hash_ctx *ctx); +void git_hash_discard(struct git_hash_ctx *ctx); const struct git_hash_algo *hash_algo_ptr_by_number(uint32_t algo); struct git_hash_ctx *git_hash_alloc(void); void git_hash_free(struct git_hash_ctx *ctx);
--
2.55.0.418.g37da59dd42