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

builtin/help: fix dangling reference to html_path

Browse Source 
In `get_html_page_path()` we may end up assigning the return value of
`system_path()` to the global `html_path` variable. But as we also
assign the returned value to `to_free`, we will deallocate its memory
upon returning from the function. Consequently, `html_path` will now
point to deallocated memory.

Fix this issue by instead assigning the value to a separate local
variable.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-09-26 13:46:00 +02:00
committed by Junio C Hamano
parent a2b7f03e65
commit 02e36f9ffa
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/help.c
View File

@@ -513,23 +513,24 @@ static void show_info_page(const char *page)
static void get_html_page_path(struct strbuf *page_path, const char *page) static void get_html_page_path(struct strbuf *page_path, const char *page)
{ {
struct stat st; struct stat st;
const char *path = html_path;
char *to_free = NULL; char *to_free = NULL;
if (!html_path) if (!path)
html_path = to_free = system_path(GIT_HTML_PATH); path = to_free = system_path(GIT_HTML_PATH);
/* /*
* Check that the page we're looking for exists. * Check that the page we're looking for exists.
*/ */
if (!strstr(html_path, "://")) { if (!strstr(path, "://")) {
if (stat(mkpath("%s/%s.html", html_path, page), &st) if (stat(mkpath("%s/%s.html", path, page), &st)
|| !S_ISREG(st.st_mode)) || !S_ISREG(st.st_mode))
die("'%s/%s.html': documentation file not found.", die("'%s/%s.html': documentation file not found.",
html_path, page); path, page);
} }
strbuf_init(page_path, 0); strbuf_init(page_path, 0);
strbuf_addf(page_path, "%s/%s.html", html_path, page); strbuf_addf(page_path, "%s/%s.html", path, page);
free(to_free); free(to_free);
} }