[PATCH v2 6/7] config: fix leak in git_config_get_expiry_in_days()
- From
Jeff King <peff@peff.net>
- Date
- Aug 17, 2020, 21:33 UTC
- Message-ID
- <20200817213313.GF1854722@coredump.intra.peff.net>
- In-Reply-To
- <20200817213228.GA1854603@coredump.intra.peff.net>
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> --- config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.c b/config.c index f0367c76ad..2bdff4457b 100644 --- a/config.c +++ b/config.c @@ -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) { - char *expiry_string; + const char *expiry_string; intmax_t days; 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 */ if (git_parse_signed(expiry_string, &days, maximum_signed_value_of_type(int))) {
-- 2.28.0.605.g35fde94f44