@matheusbsbs / matheus-bagliano / commits / d385845d55

config: store allocated string in non-const pointer

When git-config matches a url, we copy the variable section name and store it in the "section" member of a urlmatch_config struct. That member is const, since the url-matcher will not touch it (and other callers really will have a const string). But that means that we have only a const pointer to our allocated string. We have to cast away the constness when we free it, and likewise when we assign NUL to tie off the "." separating the subsection and key. This latter happens implicitly via a strchr() call, but recent versions of glibc have added annotations that let the compiler detect that and complain. Let's keep our own "section" pointer for the non-const string, and then just point config.section at it. That avoids all of the casting, both explicit and implicit. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Mar 26, 2026 at 15:23 UTC d385845d55e0e3a775fc47ac8d73a5ec41308db3

1 file changed +4 -3

builtin/config.c

+4 -3

@@ -838,6 +838,7 @@ static int get_urlmatch(const struct config_location_options *opts,

838 const char *var, const char *url)

839 {

840 int ret;

841 + char *section;

842 char *section_tail;

843 struct config_display_options display_opts = *_display_opts;

844 struct string_list_item *item;

@@ -851,8 +852,8 @@ static int get_urlmatch(const struct config_location_options *opts,

852 if (!url_normalize(url, &config.url))

853 die("%s", config.url.err);

854

854 - config.section = xstrdup_tolower(var);

855 - section_tail = strchr(config.section, '.');

855 + config.section = section = xstrdup_tolower(var);

856 + section_tail = strchr(section, '.');

857 if (section_tail) {

858 *section_tail = '\0';

859 config.key = section_tail + 1;

@@ -886,7 +887,7 @@ static int get_urlmatch(const struct config_location_options *opts,

887 string_list_clear(&values, 1);

888 free(config.url.url);

889

889 - free((void *)config.section);

890 + free(section);

891 return ret;

892 }

893