From: Hui Yiqun <huiyiqun@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, pickfire@riseup.net, peff@peff.net,
Hui Yiqun <huiyiqun@gmail.com>
Subject: [PATCH] path.c enter_repo(): fix unproper strbuf unwrapping and memory leakage
Date: Mon, 28 Mar 2016 23:51:32 +0800 [thread overview]
Message-ID: <1459180292-3475-1-git-send-email-huiyiqun@gmail.com> (raw)
In-Reply-To: <20160325175947.GC10563@sigill.intra.peff.net>
According to strbuf.h, strbuf_detach is the sole supported method
to unwrap a memory buffer from its strbuf shell.
So we should not return the pointer of strbuf.buf directly.
What's more, some memory leakages are solved.
---
path.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/path.c b/path.c
index 969b494..b07e5a7 100644
--- a/path.c
+++ b/path.c
@@ -625,6 +625,7 @@ const char *enter_repo(const char *path, int strict)
{
static struct strbuf validated_path = STRBUF_INIT;
static struct strbuf used_path = STRBUF_INIT;
+ char * dbuf = NULL;
if (!path)
return NULL;
@@ -654,7 +655,7 @@ const char *enter_repo(const char *path, int strict)
if (used_path.buf[0] == '~') {
char *newpath = expand_user_path(used_path.buf);
if (!newpath)
- return NULL;
+ goto return_null;
strbuf_attach(&used_path, newpath, strlen(newpath),
strlen(newpath));
}
@@ -671,22 +672,22 @@ const char *enter_repo(const char *path, int strict)
strbuf_setlen(&used_path, baselen);
}
if (!suffix[i])
- return NULL;
+ goto return_null;
gitfile = read_gitfile(used_path.buf);
if (gitfile) {
strbuf_reset(&used_path);
strbuf_addstr(&used_path, gitfile);
}
if (chdir(used_path.buf))
- return NULL;
- path = validated_path.buf;
+ goto return_null;
+ path = dbuf = strbuf_detach(&validated_path, NULL);
}
else {
const char *gitfile = read_gitfile(path);
if (gitfile)
path = gitfile;
if (chdir(path))
- return NULL;
+ goto return_null;
}
if (is_git_directory(".")) {
@@ -695,6 +696,10 @@ const char *enter_repo(const char *path, int strict)
return path;
}
+return_null:
+ free(dbuf);
+ strbuf_release(&used_path);
+ strbuf_release(&validated_path);
return NULL;
}
--
2.7.4
next prev parent reply other threads:[~2016-03-28 15:53 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-23 10:13 [PATCH v3/GSoC 1/5] path.c: implement strbuf_mkpath() Hui Yiqun
2016-03-23 10:13 ` [PATCH v3/GSoC 2/5] path.c: implement xdg_runtime_dir() Hui Yiqun
2016-03-25 9:59 ` Jeff King
2016-03-25 14:21 ` 惠轶群
2016-03-25 14:23 ` 惠轶群
2016-03-25 16:55 ` Junio C Hamano
2016-03-25 17:55 ` Jeff King
2016-03-25 18:00 ` Junio C Hamano
2016-03-28 13:37 ` 惠轶群
2016-03-28 14:35 ` Junio C Hamano
2016-03-25 17:59 ` Jeff King
2016-03-28 14:12 ` 惠轶群
2016-03-28 14:50 ` Junio C Hamano
2016-03-28 15:00 ` 惠轶群
2016-03-28 17:03 ` Junio C Hamano
2016-03-28 15:51 ` Hui Yiqun [this message]
2016-03-28 15:56 ` [PATCH v2] path.c enter_repo(): fix unproper strbuf unwrapping and memory leakage Hui Yiqun
2016-03-28 17:55 ` Jeff King
2016-03-29 2:40 ` 惠轶群
2016-03-28 15:57 ` [PATCH v3] " Hui Yiqun
2016-03-28 15:59 ` 惠轶群
2016-03-28 17:58 ` Junio C Hamano
2016-03-29 2:38 ` 惠轶群
2016-03-23 10:13 ` [PATCH v3/GSoC 3/5] git-credential-cache: put socket to xdg-compatible path Hui Yiqun
2016-03-25 10:00 ` Jeff King
2016-03-25 14:28 ` 惠轶群
2016-03-25 17:56 ` Jeff King
2016-03-25 18:00 ` 惠轶群
2016-03-23 10:13 ` [PATCH v3/GSoC 4/5] test-lib.sh: unset all environment variables defined in xdg base dir spec[1] Hui Yiqun
2016-03-25 10:05 ` Jeff King
2016-03-23 10:13 ` [PATCH v3/GSoC 5/5] t0301: test credential-cache support of XDG_RUNTIME_DIR Hui Yiqun
2016-03-25 7:13 ` [PATCH v3/GSoC 1/5] path.c: implement strbuf_mkpath() 惠轶群
2016-03-25 9:51 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459180292-3475-1-git-send-email-huiyiqun@gmail.com \
--to=huiyiqun@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=pickfire@riseup.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).