diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-11-30 15:24:27 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-01 11:00:10 -0800 |
| commit | dcf692625ac569fefbe52269061230f4fde10e47 (patch) | |
| tree | a56beac7a3de4c6bd8557288f802fc28738b52a4 /builtin/fetch.c | |
| parent | 4ef9caf5431dbbd23f240a25b69a989aeb9840a4 (diff) | |
| download | git-dcf692625ac569fefbe52269061230f4fde10e47.tar.gz | |
path.c: make get_pathname() call sites return const char *
Before the previous commit, get_pathname returns an array of PATH_MAX
length. Even if git_path() and similar functions does not use the
whole array, git_path() caller can, in theory.
After the commit, get_pathname() may return a buffer that has just
enough room for the returned string and git_path() caller should never
write beyond that.
Make git_path(), mkpath() and git_path_submodule() return a const
buffer to make sure callers do not write in it at all.
This could have been part of the previous commit, but the "const"
conversion is too much distraction from the core changes in path.c.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fetch.c')
| -rw-r--r-- | builtin/fetch.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 7b84d35d83..cb54936df0 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -587,7 +587,8 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, struct strbuf note = STRBUF_INIT; const char *what, *kind; struct ref *rm; - char *url, *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD"); + char *url; + const char *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD"); int want_status; fp = fopen(filename, "a"); @@ -821,7 +822,7 @@ static void check_not_current_branch(struct ref *ref_map) static int truncate_fetch_head(void) { - char *filename = git_path("FETCH_HEAD"); + const char *filename = git_path("FETCH_HEAD"); FILE *fp = fopen(filename, "w"); if (!fp) |