compat/fsmonitor: fix socket path in networked SHA256 repos

The IPC socket used by the fsmonitor on Darwin is usually contained in
the Git repository itself. When the repository is hosted on a networked
filesystem though, we instead create the socket path in the user's home
directory or the socket directory. In that case, we derive the path by
hashing the repository path.

But while we always use SHA1 to hash the repository path, we then end up
using `hash_to_hex()` to append the computed hash to the socket path.
This is wrong because `hash_to_hex()` uses the hash algorithm configured
in `the_repository`, which may not be SHA1. The consequence is that we
may append uninitialized bytes to the path when operating in a SHA256
repository.

Fix this bug by using `hash_to_hex_algop()` with SHA1.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/compat/fsmonitor/fsm-ipc-darwin.c b/compat/fsmonitor/fsm-ipc-darwin.c
index 6f3a95410cc1002a08b4af63bc9fff0d1e1e75ea..52f4f29720619b73e800cac22bde0c8b18ea19b1 100644 (file)
--- a/compat/fsmonitor/fsm-ipc-darwin.c
+++ b/compat/fsmonitor/fsm-ipc-darwin.c
@@ -17,7 +17,7 @@ const char *fsmonitor_ipc__get_path(struct repository *r)
        git_SHA_CTX sha1ctx;
        char *sock_dir = NULL;
        struct strbuf ipc_file = STRBUF_INIT;
-       unsigned char hash[GIT_MAX_RAWSZ];
+       unsigned char hash[GIT_SHA1_RAWSZ];
 
        if (!r)
                BUG("No repository passed into fsmonitor_ipc__get_path");
@@ -41,9 +41,10 @@ const char *fsmonitor_ipc__get_path(struct repository *r)
        /* Create the socket file in either socketDir or $HOME */
        if (sock_dir && *sock_dir) {
                strbuf_addf(&ipc_file, "%s/.git-fsmonitor-%s",
-                                       sock_dir, hash_to_hex(hash));
+                           sock_dir, hash_to_hex_algop(hash, &hash_algos[GIT_HASH_SHA1]));
        } else {
-               strbuf_addf(&ipc_file, "~/.git-fsmonitor-%s", hash_to_hex(hash));
+               strbuf_addf(&ipc_file, "~/.git-fsmonitor-%s",
+                           hash_to_hex_algop(hash, &hash_algos[GIT_HASH_SHA1]));
        }
        free(sock_dir);