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 /builtin | |
| 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 'builtin')
| -rw-r--r-- | builtin/fast-import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fast-import.c b/builtin/fast-import.c index 1fa2929a01..0f86392761 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -1106,7 +1106,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark) || (pack_size + PACK_SIZE_THRESHOLD + len) < pack_size) cycle_packfile(); - the_hash_algo->init_fn(&checkpoint.ctx); + the_hash_algo->unsafe_init_fn(&checkpoint.ctx); hashfile_checkpoint(pack_file, &checkpoint); offset = checkpoint.offset; |