From: Thomas Rast <trast@student.ethz.ch>
To: Matthieu Moy <Matthieu.Moy@imag.fr>,
<Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>,
<Valentin.Duperray@ensimag.imag.fr>,
<Franck.Jonas@ensimag.imag.fr>, <Lucien.Kong@ensimag.imag.fr>,
<Thomas.Nguy@ensimag.imag.fr>
Cc: <git@vger.kernel.org>, <gitster@pobox.com>
Subject: Re: [PATCH 1/4 v8] config: read (but not write) from $XDG_CONFIG_HOME/git/config file
Date: Thu, 12 Jul 2012 09:55:22 +0200 [thread overview]
Message-ID: <877gu9wh05.fsf@thomas.inf.ethz.ch> (raw)
In-Reply-To: <1340355806-6894-2-git-send-email-Matthieu.Moy@imag.fr> (Matthieu Moy's message of "Fri, 22 Jun 2012 11:03:23 +0200")
Hi all,
This patch causes valgrind warnings in t1300.81 (get --path copes with
unset $HOME) about passing NULL to access():
==25286== Syscall param access(pathname) points to unaddressable byte(s)
==25286== at 0x56E2227: access (in /lib64/libc-2.14.1.so)
==25286== by 0x48CA42: git_config_early (config.c:948)
==25286== by 0x4F0C20: check_repository_format_gently (setup.c:369)
==25286== by 0x4F1A52: setup_git_directory_gently_1 (setup.c:531)
==25286== by 0x4F24ED: setup_git_directory_gently (setup.c:725)
==25286== by 0x405D8C: run_builtin (git.c:287)
==25286== by 0x40548E: main (git.c:467)
==25286== Address 0x0 is not stack'd, malloc'd or (recently) free'd
AFAICT it is this bit of code:
Matthieu Moy <Matthieu.Moy@imag.fr> writes:
> +void home_config_paths(char **global, char **xdg, char *file)
> +{
> + char *xdg_home = getenv("XDG_CONFIG_HOME");
> + char *home = getenv("HOME");
> + char *to_free = NULL;
> +
> + if (!home) {
> + if (global)
> + *global = NULL;
[...]
> int git_config_early(config_fn_t fn, void *data, const char *repo_config)
> {
> int ret = 0, found = 0;
> - const char *home = NULL;
> + char *xdg_config = NULL;
> + char *user_config = NULL;
> +
> + home_config_paths(&user_config, &xdg_config, "config");
>
> if (git_config_system() && !access(git_etc_gitconfig(), R_OK)) {
> ret += git_config_from_file(fn, git_etc_gitconfig(),
> @@ -937,14 +940,14 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
> found += 1;
> }
>
> - home = getenv("HOME");
> - if (home) {
> - char buf[PATH_MAX];
> - char *user_config = mksnpath(buf, sizeof(buf), "%s/.gitconfig", home);
> - if (!access(user_config, R_OK)) {
> - ret += git_config_from_file(fn, user_config, data);
> - found += 1;
> - }
> + if (!access(xdg_config, R_OK)) {
> + ret += git_config_from_file(fn, xdg_config, data);
> + found += 1;
> + }
> +
> + if (!access(user_config, R_OK)) {
> + ret += git_config_from_file(fn, user_config, data);
> + found += 1;
> }
That is, while the old code was careful about home==NULL, the new code
checks this only in home_config_paths(); after that, it does no further
NULL check.
There's a similar instance in your changes to cmd_config(), found by
running 'unset HOME; valgrind git config --global --get foo.bar':
==27841== Syscall param access(pathname) points to unaddressable byte(s)
==27841== at 0x56E2227: access (in /lib64/libc-2.14.1.so)
==27841== by 0x425280: cmd_config (config.c:390)
==27841== by 0x405C34: run_builtin (git.c:306)
==27841== by 0x40548E: main (git.c:467)
==27841== Address 0x0 is not stack'd, malloc'd or (recently) free'd
around here:
> @@ -379,13 +382,20 @@ int cmd_config(int argc, const char **argv, const char *prefix)
[...]
> + char *user_config = NULL;
> + char *xdg_config = NULL;
> +
> + home_config_paths(&user_config, &xdg_config, "config");
> +
> + if (access(user_config, R_OK) && !access(xdg_config, R_OK) &&
Can you fix this?
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2012-07-12 7:55 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1338400509-26087-1-git-send-email-Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>
2012-05-30 21:19 ` [PATCHv2] Possibility to read both from ~/.gitconfig and from $XDG_CONFIG_HOME/git/config Huynh Khoi Nguyen NGUYEN
2012-05-30 21:54 ` Junio C Hamano
2012-05-31 22:06 ` Ramsay Jones
2012-05-31 14:40 ` [PATCHv3] Read from XDG configuration file, not write Huynh Khoi Nguyen NGUYEN
2012-05-31 20:13 ` Junio C Hamano
2012-06-01 21:23 ` [PATCHv4] Read (but not write) from XDG configuration, XDG attributes and XDG ignore files Huynh Khoi Nguyen NGUYEN
2012-06-02 11:20 ` Matthieu Moy
2012-06-02 15:52 ` nguyenhu
2012-06-02 21:05 ` Matthieu Moy
2012-06-03 20:14 ` [PATCHv5 1/4] Read (but not write) from $XDG_CONFIG_HOME/git/config file Huynh Khoi Nguyen NGUYEN
2012-06-03 20:14 ` [PATCHv5 2/4] Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore Huynh Khoi Nguyen NGUYEN
2012-06-04 11:43 ` Matthieu Moy
2012-06-05 13:17 ` nguyenhu
2012-06-03 20:14 ` [PATCHv5 3/4] Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes Huynh Khoi Nguyen NGUYEN
2012-06-03 20:14 ` [PATCHv5 4/4] Write to $XDG_CONFIG_HOME/git/config file Huynh Khoi Nguyen NGUYEN
2012-06-04 21:17 ` Matthieu Moy
2012-06-05 13:04 ` nguyenhu
2012-06-06 13:21 ` [PATCHv6 1/4] Read (but not write) from " Huynh Khoi Nguyen NGUYEN
2012-06-06 13:21 ` [PATCHv6 2/4] Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore Huynh Khoi Nguyen NGUYEN
2012-06-07 23:31 ` Junio C Hamano
2012-06-08 8:47 ` Matthieu Moy
2012-06-08 9:02 ` nguyenhu
2012-06-06 13:21 ` [PATCHv6 3/4] Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes Huynh Khoi Nguyen NGUYEN
2012-06-06 13:21 ` [PATCHv6 4/4] Write to $XDG_CONFIG_HOME/git/config file Huynh Khoi Nguyen NGUYEN
2012-06-09 3:48 ` David Aguilar
2012-06-09 6:19 ` Junio C Hamano
2012-06-09 17:25 ` David Aguilar
2012-06-10 13:21 ` Matthieu Moy
2012-06-11 23:45 ` nguyenhu
2012-06-07 22:58 ` [PATCHv6 1/4] Read (but not write) from " Junio C Hamano
2012-06-08 9:57 ` nguyenhu
2012-06-12 17:42 ` Ramsay Jones
2012-06-08 12:26 ` nguyenhu
2012-06-08 12:33 ` Erik Faye-Lund
2012-06-08 12:54 ` nguyenhu
2012-06-08 12:57 ` Erik Faye-Lund
2012-06-08 15:08 ` Junio C Hamano
2012-06-09 10:53 ` nguyenhu
2012-06-10 6:41 ` Junio C Hamano
2012-06-10 13:48 ` nguyenhu
2012-06-10 18:44 ` Erik Faye-Lund
2012-06-10 20:02 ` nguyenhu
2012-06-10 20:27 ` Erik Faye-Lund
2012-06-11 15:50 ` Junio C Hamano
2012-06-11 16:53 ` nguyenhu
2012-06-11 22:59 ` nguyenhu
2012-06-11 23:03 ` Erik Faye-Lund
2012-06-12 2:49 ` [PATCHv7 " Huynh Khoi Nguyen Nguyen
2012-06-12 2:49 ` [PATCHv7 2/4] Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore Huynh Khoi Nguyen Nguyen
2012-06-12 2:49 ` [PATCHv7 3/4] Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes Huynh Khoi Nguyen Nguyen
2012-06-12 2:49 ` [PATCHv7 4/4] Write to $XDG_CONFIG_HOME/git/config file Huynh Khoi Nguyen Nguyen
2012-06-14 17:31 ` [PATCHv7 1/4] Read (but not write) from " Ramsay Jones
2012-06-21 16:55 ` Matthieu Moy
2012-06-21 17:22 ` Junio C Hamano
2012-06-22 9:03 ` [PATCH 0/4 v8] Git configuration directory Matthieu Moy
2012-06-22 9:03 ` [PATCH 1/4 v8] config: read (but not write) from $XDG_CONFIG_HOME/git/config file Matthieu Moy
2012-07-12 7:55 ` Thomas Rast [this message]
2012-07-12 12:04 ` [PATCH] config: fix several access(NULL) calls Matthieu Moy
2012-07-12 12:39 ` Thomas Rast
2012-07-12 17:14 ` Junio C Hamano
2012-07-12 19:34 ` Matthieu Moy
2012-07-12 20:12 ` Junio C Hamano
2012-07-13 8:48 ` Matthieu Moy
2012-07-13 8:59 ` [PATCH v2] " Matthieu Moy
2012-07-13 13:00 ` [PATCH] " Jeff King
2012-07-13 13:15 ` Matthieu Moy
2012-07-13 14:05 ` Thomas Rast
2012-07-13 14:23 ` Matthieu Moy
2012-07-13 16:49 ` Junio C Hamano
2012-07-16 9:45 ` Matthieu Moy
2012-07-16 16:35 ` Junio C Hamano
2012-07-16 16:39 ` Matthieu Moy
2012-07-16 16:56 ` Junio C Hamano
2012-06-22 9:03 ` [PATCH 2/4 v8] Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore Matthieu Moy
2012-06-22 9:03 ` [PATCH 3/4 v8] Let core.attributesfile " Matthieu Moy
2012-06-22 21:20 ` Junio C Hamano
2012-06-25 6:32 ` Matthieu Moy
2012-06-25 7:22 ` Junio C Hamano
2012-06-25 7:56 ` Matthieu Moy
2012-06-22 9:03 ` [PATCH 4/4 v8] config: write to $XDG_CONFIG_HOME/git/config file if appropriate Matthieu Moy
2012-06-22 21:20 ` Junio C Hamano
2012-06-25 6:45 ` Matthieu Moy
2012-06-25 18:08 ` Junio C Hamano
2012-06-22 21:19 ` [PATCH 0/4 v8] Git configuration directory Junio C Hamano
2012-06-04 17:54 ` [PATCHv4] Read (but not write) from XDG configuration, XDG attributes and XDG ignore files Ramsay Jones
2012-06-04 18:41 ` Junio C Hamano
2012-06-12 17:32 ` Ramsay Jones
2012-06-05 12:19 ` nguyenhu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877gu9wh05.fsf@thomas.inf.ethz.ch \
--to=trast@student.ethz.ch \
--cc=Franck.Jonas@ensimag.imag.fr \
--cc=Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr \
--cc=Lucien.Kong@ensimag.imag.fr \
--cc=Matthieu.Moy@imag.fr \
--cc=Thomas.Nguy@ensimag.imag.fr \
--cc=Valentin.Duperray@ensimag.imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).