From: Patrick Steinhardt Date: Fri, 7 Jun 2024 06:39:12 +0000 (+0200) Subject: mailmap: always store allocated strings in mailmap blob X-Git-Tag: v2.46.0-rc0~52^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c77756015e66e5fc601cfb6a368c37ef1f94285a;p=thirdparty%2Fgit.git mailmap: always store allocated strings in mailmap blob Same as with the preceding commit, the `git_mailmap_blob` may sometimes contain an allocated string and sometimes it may contain a string constant. This is risky and can easily lead to bugs in case the variable is getting re-assigned, where the code may then try to free the previous value to avoid memory leaks. Safeguard the code by always storing allocated strings in the variable. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- diff --git a/mailmap.c b/mailmap.c index b2efe29b3d..3d1e092fef 100644 --- a/mailmap.c +++ b/mailmap.c @@ -216,7 +216,7 @@ int read_mailmap(struct string_list *map) map->cmp = namemap_cmp; if (!git_mailmap_blob && is_bare_repository()) - git_mailmap_blob = "HEAD:.mailmap"; + git_mailmap_blob = xstrdup("HEAD:.mailmap"); if (!startup_info->have_repository || !is_bare_repository()) err |= read_mailmap_file(map, ".mailmap",