diff options
author | Junio C Hamano <gitster@pobox.com> | 2025-01-01 18:21:14 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2025-01-01 18:21:14 +0100 |
commit | 98422943f013b56352dd1a2f8823368b27267e57 (patch) | |
tree | 844c37a88933cc1617b4b77b0d49ed52aa48ae73 /bulk-checkin.c | |
parent | Merge branch 'rs/reftable-realloc-errors' (diff) | |
parent | ci: exercise unsafe OpenSSL backend (diff) | |
download | git-98422943f013b56352dd1a2f8823368b27267e57.tar.xz git-98422943f013b56352dd1a2f8823368b27267e57.zip |
Merge branch 'ps/weak-sha1-for-tail-sum-fix'
An earlier "csum-file checksum does not have to be computed with
sha1dc" topic had a few code paths that had initialized an
implementation of a hash function to be used by an unmatching hash
by mistake, which have been corrected.
* ps/weak-sha1-for-tail-sum-fix:
ci: exercise unsafe OpenSSL backend
builtin/fast-import: fix segfault with unsafe SHA1 backend
bulk-checkin: fix segfault with unsafe SHA1 backend
Diffstat (limited to 'bulk-checkin.c')
-rw-r--r-- | bulk-checkin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bulk-checkin.c b/bulk-checkin.c index 4a70a70a95..433070a3bd 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -272,7 +272,7 @@ static int deflate_blob_to_pack(struct bulk_checkin_packfile *state, OBJ_BLOB, size); the_hash_algo->init_fn(&ctx); the_hash_algo->update_fn(&ctx, obuf, header_len); - the_hash_algo->init_fn(&checkpoint.ctx); + the_hash_algo->unsafe_init_fn(&checkpoint.ctx); /* Note: idx is non-NULL when we are writing */ if ((flags & HASH_WRITE_OBJECT) != 0) |