From: Carlos Martín Nieto Date: Wed, 16 Mar 2011 11:26:10 GMT Subject: [PATCH] system_path: use a static buffer Message-ID: <1300274770-4798-1-git-send-email-cmn@elego.de> In-Reply-To: <20110314200958.GC22602@sigill.intra.peff.net> Make system_path behave like the other path functions by using a static buffer, fixing a memory leak. Also make sure the prefix pointer is always initialized to either PREFIX or NULL. Signed-off-by: Carlos Martín Nieto --- This fixes the leak I was trying to fix with my original patch, but this seems much cleaner exec_cmd.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/exec_cmd.c b/exec_cmd.c index 38545e8..12ce017 100644 --- a/exec_cmd.c +++ b/exec_cmd.c @@ -9,11 +9,11 @@ static const char *argv0_path; const char *system_path(const char *path) { #ifdef RUNTIME_PREFIX - static const char *prefix; + static const char *prefix = NULL; #else static const char *prefix = PREFIX; #endif - struct strbuf d = STRBUF_INIT; + static char buf[PATH_MAX+1]; if (is_absolute_path(path)) return path; @@ -33,9 +33,8 @@ const char *system_path(const char *path) } #endif - strbuf_addf(&d, "%s/%s", prefix, path); - path = strbuf_detach(&d, NULL); - return path; + snprintf(buf, PATH_MAX, "%s/%s", prefix, path); + return buf; } const char *git_extract_argv0_path(const char *argv0) -- 1.7.4.1