make CanonicalizePath report an error on empty path

Fixes part of issue 121, but the fix exposed a further issue.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/util.cc b/src/util.cc
index 0ad470e..e2b20d6 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -64,10 +64,15 @@ void Error(const char* msg, ...) {
   fprintf(stderr, "\n");
 }
 
-void CanonicalizePath(string* path) {
+bool CanonicalizePath(string* path, string* err) {
   // WARNING: this function is performance-critical; please benchmark
   // any changes you make to it.
 
+  if (path->empty()) {
+    *err = "empty path";
+    return false;
+  }
+
   const int kMaxPathComponents = 30;
   char* components[kMaxPathComponents];
   int component_count = 0;
@@ -120,6 +125,7 @@ void CanonicalizePath(string* path) {
   }
 
   path->resize(dst - path->c_str() - 1);
+  return true;
 }
 
 int MakeDir(const string& path) {