Merge branch 'js/maint-add-path-stat-pwd'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:43:36 +0000 (14:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:43:36 +0000 (14:43 -0700)
* js/maint-add-path-stat-pwd:
  get_pwd_cwd(): Do not trust st_dev/st_ino blindly

abspath.c

index 01858eb..37287f8 100644 (file)
--- a/abspath.c
+++ b/abspath.c
@@ -102,7 +102,8 @@ static const char *get_pwd_cwd(void)
        pwd = getenv("PWD");
        if (pwd && strcmp(pwd, cwd)) {
                stat(cwd, &cwd_stat);
-               if (!stat(pwd, &pwd_stat) &&
+               if ((cwd_stat.st_dev || cwd_stat.st_ino) &&
+                   !stat(pwd, &pwd_stat) &&
                    pwd_stat.st_dev == cwd_stat.st_dev &&
                    pwd_stat.st_ino == cwd_stat.st_ino) {
                        strlcpy(cwd, pwd, PATH_MAX);