[CMake] [PATCH] KWSys: Correctly handle empty environment variables

Vladimir Panteleev vladimir at thecybershadow.net
Thu Dec 15 14:56:25 EST 2011


This patch fixes a crash which occurs when SystemTools::GetPath attempts
to process an empty environment variable.
---
 Source/kwsys/SystemTools.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
index ed7f62c..4d83293 100644
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx
@@ -326,7 +326,7 @@ void SystemTools::GetPath(kwsys_stl::vector<kwsys_stl::string>& path, const char
   kwsys_stl::string pathEnv = cpathEnv;
 
   // A hack to make the below algorithm work.
-  if(pathEnv[pathEnv.length()-1] != ':')
+  if(!pathEnv.empty() && pathEnv[pathEnv.length()-1] != pathSep[0])
     {
     pathEnv += pathSep;
     }
-- 
1.7.6.msysgit.0.579.ga3d6f



More information about the CMake mailing list