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

Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maint

Browse Source 
Some codepaths did not check for errors when asking what branch the
HEAD points at, which have been fixed.

* jk/misc-resolve-ref-unsafe-fixes:
  worktree: handle broken symrefs in find_shared_symref()
  log: handle broken HEAD in decoration check
  remote: handle broken symrefs
  test-ref-store: avoid passing NULL to printf
This commit is contained in:
Junio C Hamano 2017-11-15 12:04:52 +09:00
commit 9fbcb51ec5
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/remote.c
View File

@ -565,7 +565,7 @@ static int read_remote_branches(const char *refname,
item = string_list_append(rename->remote_branches, xstrdup(refname)); item = string_list_append(rename->remote_branches, xstrdup(refname));
symref = resolve_ref_unsafe(refname, RESOLVE_REF_READING, symref = resolve_ref_unsafe(refname, RESOLVE_REF_READING,
NULL, &flag); NULL, &flag);
if (flag & REF_ISSYMREF) if (symref && (flag & REF_ISSYMREF))
item->util = xstrdup(symref); item->util = xstrdup(symref);
else else
item->util = NULL; item->util = NULL;

2
log-tree.c
View File

@ -198,7 +198,7 @@ static const struct name_decoration *current_pointed_by_HEAD(const struct name_d
/* Now resolve and find the matching current branch */ /* Now resolve and find the matching current branch */
branch_name = resolve_ref_unsafe("HEAD", 0, NULL, &rru_flags); branch_name = resolve_ref_unsafe("HEAD", 0, NULL, &rru_flags);
if (!(rru_flags & REF_ISSYMREF)) if (!branch_name || !(rru_flags & REF_ISSYMREF))
return NULL; return NULL;
if (!starts_with(branch_name, "refs/")) if (!starts_with(branch_name, "refs/"))

2
t/helper/test-ref-store.c
View File

@ -135,7 +135,7 @@ static int cmd_resolve_ref(struct ref_store *refs, const char **argv)
ref = refs_resolve_ref_unsafe(refs, refname, resolve_flags, ref = refs_resolve_ref_unsafe(refs, refname, resolve_flags,
sha1, &flags); sha1, &flags);
printf("%s %s 0x%x\n", sha1_to_hex(sha1), ref, flags); printf("%s %s 0x%x\n", sha1_to_hex(sha1), ref ? ref : "(null)", flags);
return ref ? 0 : 1; return ref ? 0 : 1;
} }

3
worktree.c
View File

@ -327,7 +327,8 @@ const struct worktree *find_shared_symref(const char *symref,
refs = get_worktree_ref_store(wt); refs = get_worktree_ref_store(wt);
symref_target = refs_resolve_ref_unsafe(refs, symref, 0, symref_target = refs_resolve_ref_unsafe(refs, symref, 0,
NULL, &flags); NULL, &flags);
if ((flags & REF_ISSYMREF) && !strcmp(symref_target, target)) { if ((flags & REF_ISSYMREF) &&
symref_target && !strcmp(symref_target, target)) {
existing = wt; existing = wt;
break; break;
} }