diff options
| author | Jeff King <peff@peff.net> | 2013-09-24 01:19:08 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-15 14:46:31 -0700 |
| commit | 11a6ba1c012e8275c70032fb2e847740a2f61865 (patch) | |
| tree | 84751bc478448f487a9b4ab99b7004b19d741b6f | |
| parent | 02a110ad435a6ccda648f09f94e546dfd7bdd0ac (diff) | |
| download | git-jk/remote-literal-string-leakfix.tar.gz | |
remote: do not copy "origin" string literaljk/remote-literal-string-leakfix
Our default_remote_name starts at "origin", but may be
overridden by the config file. In the former case, we
allocate a new string, but in the latter case, we point to
the remote name in an existing "struct branch".
This gives the variable inconsistent free() semantics (we
are sometimes responsible for freeing the string and
sometimes pointing to somebody else's storage), and causes a
small leak when the allocated string is overridden by
config.
We can fix both by simply dropping the extra copy and
pointing to the string literal.
Noticed-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | remote.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -480,7 +480,7 @@ static void read_config(void) int flag; if (default_remote_name) /* did this already */ return; - default_remote_name = xstrdup("origin"); + default_remote_name = "origin"; current_branch = NULL; head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag); if (head_ref && (flag & REF_ISSYMREF) && |