[PATCH 4/6] replace xstrdup(git_path(...)) with git_pathdup(...)
- From
Jeff King <peff@peff.net>
- Date
- Apr 20, 2017, 21:09 UTC
- Message-ID
- <20170420210909.ehy4kim6losllux7@sigill.intra.peff.net>
- In-Reply-To
- <20170420210754.bzrnc74dpjs7fgpf@sigill.intra.peff.net>
It's more efficient to use git_pathdup(), as it skips an extra copy of the path. And by removing some calls to git_path(), it makes it easier to audit for dangerous uses.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/config.c | 5 +++-- fast-import.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin/config.c b/builtin/config.c index 4f49a0edb..3407a8b87 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -597,8 +597,9 @@ int cmd_config(int argc, const char **argv, const char *prefix) if (given_config_source.blob) die("editing blobs is not supported"); git_config(git_default_config, NULL); - config_file = xstrdup(given_config_source.file ? - given_config_source.file : git_path("config")); + config_file = given_config_source.file ? + xstrdup(given_config_source.file) : + git_pathdup("config"); if (use_global_config) { int fd = open(config_file, O_CREAT | O_EXCL | O_WRONLY, 0666); if (fd >= 0) { diff --git a/fast-import.c b/fast-import.c index 1ea3a0860..cf58f875b 100644 --- a/fast-import.c +++ b/fast-import.c @@ -3202,7 +3202,7 @@ static char* make_fast_import_path(const char *path) { if (!relative_marks_paths || is_absolute_path(path)) return xstrdup(path); - return xstrdup(git_path("info/fast-import/%s", path)); + return git_pathdup("info/fast-import/%s", path); } static void option_import_marks(const char *marks,
-- 2.13.0.rc0.363.g8726c260e