From: "Carlos Martín Nieto" <cmn@elego.de>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: [PATCH] system_path: use a static buffer
Date: Wed, 16 Mar 2011 12:26:10 +0100 [thread overview]
Message-ID: <1300274770-4798-1-git-send-email-cmn@elego.de> (raw)
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 <cmn@elego.de>
---
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
next prev parent reply other threads:[~2011-03-16 11:26 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-14 19:18 [PATCH 0/3] Fix some errors reported by valgrind Carlos Martín Nieto
2011-03-14 19:18 ` [PATCH 1/3] make_absolute_path: Don't try to copy a string to itself Carlos Martín Nieto
2011-03-14 20:02 ` Jeff King
2011-03-14 20:25 ` Junio C Hamano
2011-03-14 22:02 ` Carlos Martín Nieto
2011-03-14 22:58 ` Junio C Hamano
2011-03-15 11:59 ` Carlos Martín Nieto
2011-03-15 12:40 ` Carlos Martín Nieto
2011-03-15 17:02 ` Junio C Hamano
2011-03-15 17:27 ` Carlos Martín Nieto
2011-03-16 14:16 ` Nguyen Thai Ngoc Duy
2011-03-16 14:49 ` Carlos Martín Nieto
2011-03-16 14:58 ` Nguyen Thai Ngoc Duy
2011-03-16 14:04 ` Nguyen Thai Ngoc Duy
2011-03-16 15:08 ` Carlos Martín Nieto
2011-03-14 19:18 ` [PATCH 2/3] setup_path(): Free temporary buffer Carlos Martín Nieto
2011-03-14 20:09 ` Jeff King
2011-03-14 22:18 ` Carlos Martín Nieto
2011-03-16 11:26 ` Carlos Martín Nieto [this message]
2011-03-16 15:58 ` [PATCH] system_path: use a static buffer Erik Faye-Lund
2011-03-16 16:24 ` Carlos Martín Nieto
2011-03-16 16:33 ` Carlos Martín Nieto
2011-03-16 20:43 ` Junio C Hamano
2011-03-17 11:01 ` Carlos Martín Nieto
2011-03-17 14:24 ` Carlos Martín Nieto
2011-03-18 7:25 ` Junio C Hamano
2011-03-21 9:56 ` Carlos Martín Nieto
2011-03-21 11:14 ` Jeff King
2011-03-21 15:26 ` Carlos Martín Nieto
2011-03-21 15:51 ` Jeff King
2011-03-21 15:57 ` Carlos Martín Nieto
2011-03-18 10:34 ` Nguyen Thai Ngoc Duy
2011-03-18 11:38 ` PATH_MAX (Re: [PATCH] system_path: use a static buffer) Jonathan Nieder
2011-03-18 11:54 ` Nguyen Thai Ngoc Duy
2011-03-21 9:47 ` Carlos Martín Nieto
2011-03-21 12:37 ` Lasse Makholm
2011-03-21 11:19 ` Nguyen Thai Ngoc Duy
2011-03-18 11:39 ` [PATCH 1/2] wrapper.c: add xgetcwd() Nguyễn Thái Ngọc Duy
2011-03-18 11:39 ` [PATCH 2/2] setup_gently: use xgetcwd() Nguyễn Thái Ngọc Duy
2011-03-14 20:14 ` [PATCH 2/3] setup_path(): Free temporary buffer Junio C Hamano
2011-03-14 22:01 ` Carlos Martín Nieto
2011-03-15 1:12 ` Jeff King
2011-03-15 9:32 ` [PATCH] t/README: Add a note about running commands under valgrind Carlos Martín Nieto
2011-03-15 17:06 ` Junio C Hamano
2011-03-15 17:08 ` Carlos Martín Nieto
2011-03-14 19:18 ` [PATCH 3/3] clone: Free a few paths Carlos Martín Nieto
2011-03-14 19:45 ` Jonathan Nieder
2011-03-18 7:25 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2011-03-31 14:36 [PATCH] system_path: use a static buffer Carlos Martín Nieto
2011-03-31 22:42 ` Junio C Hamano
2011-03-31 23:23 ` Carlos Martín Nieto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1300274770-4798-1-git-send-email-cmn@elego.de \
--to=cmn@elego.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).