Merge branch 'maint'

* maint: Don't crash when getcwd() fails
jmartens · Aug 3, 2011 · cce69f0 · cce69f0
2 parents 2fb75b8 + 83f5a1e
commit cce69f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ccache.c b/ccache.c
@@ -2186,6 +2186,10 @@ ccache_main(int argc, char *argv[])
 	}
 
 	current_working_dir = get_cwd();
+	if (!current_working_dir) {
+		cc_log("Could not determine current working directory");
+		failed();
+	}
 	cache_dir = getenv("CCACHE_DIR");
 	if (cache_dir) {
 		cache_dir = x_strdup(cache_dir);

diff --git a/util.c b/util.c
@@ -905,7 +905,8 @@ gnu_getcwd(void)
 		}
 		free(buffer);
 		if (errno != ERANGE) {
-			return 0;
+			cc_log("getcwd error: %d (%s)", errno, strerror(errno));
+			return NULL;
 		}
 		size *= 2;
 	}
@@ -987,6 +988,9 @@ get_cwd(void)
 	struct stat st_cwd;
 
 	cwd = gnu_getcwd();
+	if (!cwd) {
+		return NULL;
+	}
 	pwd = getenv("PWD");
 	if (!pwd) {
 		return cwd;