mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bulk-checkin.c: store checksum directly

Browse Source 
finish_bulk_checkin() stores the checksum from finalize_hashfile() by
writing to the `hash` member of `struct object_id`, but that hash has
nothing to do with an object id (it's just a convenient location that
happens to be sized correctly).

Store the hash directly in an unsigned char array. This behaves the same
as writing to the `hash` member, but makes the intent clearer (and
avoids allocating an extra four bytes for the `algo` member of `struct
object_id`). It likewise prevents the possibility of a segfault when
reading `algo` (e.g., by calling `oid_to_hex()`) if it is uninitialized.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau
2021-09-09 19:24:32 -04:00
committed by Junio C Hamano
parent 0c41a887b4
commit ae44b5a4f3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bulk-checkin.c
View File

@ -25,7 +25,7 @@ static struct bulk_checkin_state {
static void finish_bulk_checkin(struct bulk_checkin_state *state) static void finish_bulk_checkin(struct bulk_checkin_state *state)
{ {
struct object_id oid; unsigned char hash[GIT_MAX_RAWSZ];
struct strbuf packname = STRBUF_INIT; struct strbuf packname = STRBUF_INIT;
int i; int i;
@ -37,11 +37,11 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state)
unlink(state->pack_tmp_name); unlink(state->pack_tmp_name);
goto clear_exit; goto clear_exit;
} else if (state->nr_written == 1) { } else if (state->nr_written == 1) {
finalize_hashfile(state->f, oid.hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE); finalize_hashfile(state->f, hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE);
} else { } else {
int fd = finalize_hashfile(state->f, oid.hash, 0); int fd = finalize_hashfile(state->f, hash, 0);
fixup_pack_header_footer(fd, oid.hash, state->pack_tmp_name, fixup_pack_header_footer(fd, hash, state->pack_tmp_name,
state->nr_written, oid.hash, state->nr_written, hash,
state->offset); state->offset);
close(fd); close(fd);
} }
@ -49,7 +49,7 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state)
strbuf_addf(&packname, "%s/pack/pack-", get_object_directory()); strbuf_addf(&packname, "%s/pack/pack-", get_object_directory());
finish_tmp_packfile(&packname, state->pack_tmp_name, finish_tmp_packfile(&packname, state->pack_tmp_name,
state->written, state->nr_written, state->written, state->nr_written,
&state->pack_idx_opts, oid.hash); &state->pack_idx_opts, hash);
for (i = 0; i < state->nr_written; i++) for (i = 0; i < state->nr_written; i++)
free(state->written[i]); free(state->written[i]);