remote: do not copy "origin" string literal
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>
This commit is contained in:
parent
02a110ad43
commit
11a6ba1c01
2
remote.c
2
remote.c
@ -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) &&
|
||||
|
Loading…
Reference in New Issue
Block a user