diff options
| author | Brad King <brad.king@kitware.com> | 2008-01-21 00:29:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-01-21 00:29:12 (GMT) |
| commit | ce2b20361a152008994e5083b6d310e98b40e0e1 (patch) | |
| tree | ea36c032cef7dca3feeef0d5df2389c6eb72b347 /Source | |
| parent | 9f982d7d39a92fa1164a6e3f653dbce17ca38ad7 (diff) | |
| download | CMake-ce2b20361a152008994e5083b6d310e98b40e0e1.zip CMake-ce2b20361a152008994e5083b6d310e98b40e0e1.tar.gz CMake-ce2b20361a152008994e5083b6d310e98b40e0e1.tar.bz2 | |
BUG: Fix previous commit to not access empty strings out of bounds.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFindLibraryCommand.cxx | 2 | ||||
| -rw-r--r-- | Source/cmFindPathCommand.cxx | 2 | ||||
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx index e7cfbeb..6f0b23a 100644 --- a/Source/cmFindLibraryCommand.cxx +++ b/Source/cmFindLibraryCommand.cxx @@ -186,7 +186,7 @@ std::string cmFindLibraryCommand::FindLibrary(const char* name) i != this->SearchPaths.end(); ++i) { std::string& p = *i; - if(p[p.size()-1] != '/') + if(p.empty() || p[p.size()-1] != '/') { p += "/"; } diff --git a/Source/cmFindPathCommand.cxx b/Source/cmFindPathCommand.cxx index 53531dd..6280187 100644 --- a/Source/cmFindPathCommand.cxx +++ b/Source/cmFindPathCommand.cxx @@ -106,7 +106,7 @@ bool cmFindPathCommand::InitialPass(std::vector<std::string> const& argsIn) i != this->SearchPaths.end(); ++i) { std::string& p = *i; - if(p[p.size()-1] != '/') + if(p.empty() || p[p.size()-1] != '/') { p += "/"; } diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index de00019..d209682 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -2117,7 +2117,7 @@ kwsys_stl::string SystemTools i != path.end(); ++i) { kwsys_stl::string& p = *i; - if(p[p.size()-1] != '/') + if(p.empty() || p[p.size()-1] != '/') { p += "/"; } @@ -2249,7 +2249,7 @@ kwsys_stl::string SystemTools::FindProgram( i != path.end(); ++i) { kwsys_stl::string& p = *i; - if(p[p.size()-1] != '/') + if(p.empty() || p[p.size()-1] != '/') { p += "/"; } @@ -2341,7 +2341,7 @@ kwsys_stl::string SystemTools i != path.end(); ++i) { kwsys_stl::string& p = *i; - if(p[p.size()-1] != '/') + if(p.empty() || p[p.size()-1] != '/') { p += "/"; } |