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

Merge branch 'jc/xstrfmt-null-with-prec-0'

Browse Source 
* jc/xstrfmt-null-with-prec-0:
  setup.c: do not feed NULL to "%.*s" even with precision 0
This commit is contained in:
Junio C Hamano
2016-04-22 15:45:07 -07:00
parent 0709261a83 24041d6be5
commit 3f80d16c1c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup.c
View File

@ -102,7 +102,7 @@ char *prefix_path_gently(const char *prefix, int len,
return NULL; return NULL;
} }
} else { } else {
sanitized = xstrfmt("%.*s%s", len, prefix, path); sanitized = xstrfmt("%.*s%s", len, len ? prefix : "", path);
if (remaining_prefix) if (remaining_prefix)
*remaining_prefix = len; *remaining_prefix = len;
if (normalize_path_copy_len(sanitized, sanitized, remaining_prefix)) { if (normalize_path_copy_len(sanitized, sanitized, remaining_prefix)) {