undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: fix leak in git_config_get_expiry_in_days()

Browse Source 
We use git_config_get_string() to retrieve the expiry value in a newly
allocated string. But after parsing it, we never free it, leaking the
memory.

We could fix this with a free() obviously, but there's an even better
solution: we can use the non-allocating "tmp" variant of the function;
we only need it to be valid for the lifetime of our parse function.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2020-08-17 17:33:13 -04:00 committed by Junio C Hamano
parent 9a53219f69
commit 1c890016a1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.c
View File

@ -2300,11 +2300,11 @@ int git_config_get_expiry(const char *key, const char **output)
int git_config_get_expiry_in_days(const char *key, timestamp_t *expiry, timestamp_t now) int git_config_get_expiry_in_days(const char *key, timestamp_t *expiry, timestamp_t now)
{ {
char *expiry_string; const char *expiry_string;
intmax_t days; intmax_t days;
timestamp_t when; timestamp_t when;
if (git_config_get_string(key, &expiry_string)) if (git_config_get_string_tmp(key, &expiry_string))
return 1; /* no such thing */ return 1; /* no such thing */
if (git_parse_signed(expiry_string, &days, maximum_signed_value_of_type(int))) { if (git_parse_signed(expiry_string, &days, maximum_signed_value_of_type(int))) {