mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/realpath-pathdup-fix'

Browse Source 
Git v2.12 was shipped with an embarrassing breakage where various
operations that verify paths given from the user stopped dying when
seeing an issue, and instead later triggering segfault.

* js/realpath-pathdup-fix:
  real_pathdup(): fix callsites that wanted it to die on error
  t1501: demonstrate NULL pointer access with invalid GIT_WORK_TREE
This commit is contained in:
Junio C Hamano
2017-03-12 23:21:33 -07:00
parent fb070d2f17 ce83eadd9a
commit ba37c92df9
9 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup.c
View File

@ -698,7 +698,7 @@ static const char *setup_discovered_git_dir(const char *gitdir,
/* --work-tree is set without --git-dir; use discovered one */
if (getenv(GIT_WORK_TREE_ENVIRONMENT) || git_work_tree_cfg) {
if (offset != cwd->len && !is_absolute_path(gitdir))
gitdir = real_pathdup(gitdir);
gitdir = real_pathdup(gitdir, 1);
if (chdir(cwd->buf))
die_errno("Could not come back to cwd");
return setup_explicit_git_dir(gitdir, cwd, nongit_ok);
@ -806,7 +806,7 @@ static int canonicalize_ceiling_entry(struct string_list_item *item,
/* Keep entry but do not canonicalize it */
return 1;
} else {
char *real_path = real_pathdup(ceil);
char *real_path = real_pathdup(ceil, 0);
if (!real_path) {
return 0;
}