undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote: do not copy "origin" string literal

Browse Source 
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:
Jeff King 2013-09-24 01:19:08 -04:00 committed by Junio C Hamano
parent 02a110ad43
commit 11a6ba1c01
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
remote.c
View File

@ -480,7 +480,7 @@ static void read_config(void)
int flag; int flag;
if (default_remote_name) /* did this already */ if (default_remote_name) /* did this already */
return; return;
default_remote_name = xstrdup("origin"); default_remote_name = "origin";
current_branch = NULL; current_branch = NULL;
head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag); head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag);
if (head_ref && (flag & REF_ISSYMREF) && if (head_ref && (flag & REF_ISSYMREF) &&