diff options
| author | Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com> | 2020-03-10 13:11:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-10 18:41:40 (GMT) |
| commit | 4530a85b4c34f009b5f190eb2dc8367801de5028 (patch) | |
| tree | 8e6a4c01147521978d89637b87d50ab75546d647 /sha1-file.c | |
| parent | 3d7747e318532a36a263c61cdf92f2decb6424ff (diff) | |
| download | git-4530a85b4c34f009b5f190eb2dc8367801de5028.zip git-4530a85b4c34f009b5f190eb2dc8367801de5028.tar.gz git-4530a85b4c34f009b5f190eb2dc8367801de5028.tar.bz2 | |
real_path_if_valid(): remove unsafe API
This commit continues the work started with previous commit.
Signed-off-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1-file.c')
| -rw-r--r-- | sha1-file.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sha1-file.c b/sha1-file.c index 6168867..f2b2465 100644 --- a/sha1-file.c +++ b/sha1-file.c @@ -676,20 +676,15 @@ void add_to_alternates_memory(const char *reference) char *compute_alternate_path(const char *path, struct strbuf *err) { char *ref_git = NULL; - const char *repo, *ref_git_s; + const char *repo; int seen_error = 0; - ref_git_s = real_path_if_valid(path); - if (!ref_git_s) { + ref_git = real_pathdup(path, 0); + if (!ref_git) { seen_error = 1; strbuf_addf(err, _("path '%s' does not exist"), path); goto out; - } else - /* - * Beware: read_gitfile(), real_path() and mkpath() - * return static buffer - */ - ref_git = xstrdup(ref_git_s); + } repo = read_gitfile(ref_git); if (!repo) |