[PATCH 1/8] config: fix bogus fd check when setting up default config
- From
Jeff King <peff@peff.net>
- Date
- Jul 8, 2016, 09:06 UTC
- Message-ID
- <20160708090649.GA10152@sigill.intra.peff.net>
- In-Reply-To
- <20160708090400.GA26594@sigill.intra.peff.net>
Since 9830534 (config --global --edit: create a template file if needed, 2014-07-25), an edit of the global config file will try to open() it with O_EXCL, and wants to handle three cases:
1. We succeeded; the user has no config file, and we
should fill in the default template.2. We got EEXIST; they have a file already, proceed as usual.
3. We got another error; we should complain.
However, the check for case 1 does "if (fd)", which will generally _always_ be true (except for the oddball case that somehow our stdin got closed and opening really did give us a new descriptor 0).
So in the EEXIST case, we tried to write the default config anyway! Fortunately, this turns out to be a noop, since we just end up writing to and closing "-1", which does nothing.
But in case 3, we would fail to notice any other errors, and just silently continue (given that we don't actually notice write errors for the template either, it's probably not that big a deal; we're about to spawn the editor, so it would notice any problems. But the code is clearly _trying_ to hit cover this case and failing).
We can fix it easily by using "fd >= 0" for case 1.
Signed-off-by: Jeff King <peff@peff.net> --- I was looking at this to see whether it could be converted to write_file(). However, the O_EXCL and the error-handling make things too tricky.
builtin/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/config.c b/builtin/config.c index 1d7c6ef..a991a53 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -604,7 +604,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) given_config_source.file : git_path("config")); if (use_global_config) { int fd = open(config_file, O_CREAT | O_EXCL | O_WRONLY, 0666); - if (fd) { + if (fd >= 0) { char *content = default_user_config(); write_str_in_full(fd, content); free(content);
-- 2.9.0.393.g704e522