From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Mon, 6 Feb 2023 23:07:45 +0000 (+0100)
Subject: http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}()
X-Git-Tag: v2.40.0-rc0~7^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2139bd0200b2ee51674d8778cd26a9f38220a5b7;p=thirdparty%2Fgit.git

http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}()

Fix a memory leak that's been with us ever since
2f4038ab337 (Git-aware CGI to provide dumb HTTP transport,
2009-10-30). In this case we're not calling regerror() after a failed
regexec(), and don't otherwise use "re" afterwards.

We can therefore simplify this code by calling regfree() right after
the regexec(). An alternative fix would be to add a regfree() to both
the "return" and "break" path in this for-loop.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/http-backend.c b/http-backend.c
index 67819d931c..8ab58e55f8 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -759,10 +759,14 @@ int cmd_main(int argc, const char **argv)
 		struct service_cmd *c = &services[i];
 		regex_t re;
 		regmatch_t out[1];
+		int ret;
 
 		if (regcomp(&re, c->pattern, REG_EXTENDED))
 			die("Bogus regex in service table: %s", c->pattern);
-		if (!regexec(&re, dir, 1, out, 0)) {
+		ret = regexec(&re, dir, 1, out, 0);
+		regfree(&re);
+
+		if (!ret) {
 			size_t n;
 
 			if (strcmp(method, c->method))
@@ -774,7 +778,6 @@ int cmd_main(int argc, const char **argv)
 			dir[out[0].rm_so] = 0;
 			break;
 		}
-		regfree(&re);
 	}
 
 	if (!cmd)