]> git.ipfire.org Git - thirdparty/git.git/commitdiff
shallow: give write_one_shallow() its own hex buffer
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Fri, 10 Jul 2026 11:39:36 +0000 (11:39 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jul 2026 15:13:55 +0000 (08:13 -0700)
The previous fix reuses the local `hex` variable that is already
computed at the top of `write_one_shallow()`. That works today, but
`oid_to_hex()` returns a pointer into a small rotating buffer, so it is
not stable across an unrelated call to `oid_to_hex()` from the same
thread. A future edit that adds such a call between the assignment and
the last user of `hex` would silently corrupt the output.

Move `write_one_shallow()` off the rotating buffer entirely by using a
local buffer instead. The current users of that `hex` variable are
unchanged.

Suggested-by: Junio C Hamano <gitster@pobox.com>
Assisted-by: Claude Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
shallow.c

index 2f96db5170bcc870ce0660940f3a2d7c33c3d969..c567cc3c69fe4c15a11f62fac7ede5389cba6224 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -359,7 +359,9 @@ struct write_shallow_data {
 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
 {
        struct write_shallow_data *data = cb_data;
-       const char *hex = oid_to_hex(&graft->oid);
+       char hex[GIT_MAX_HEXSZ + 1];
+
+       oid_to_hex_r(hex, &graft->oid);
        if (graft->nr_parent != -1)
                return 0;
        if (data->flags & QUICK) {