kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fix previous commit to not access empty strings out of bounds.

This commit is contained in:
Brad King 2008-01-20 19:29:12 -05:00
parent 9f982d7d39
commit ce2b20361a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmFindLibraryCommand.cxx
View File

@ -186,7 +186,7 @@ std::string cmFindLibraryCommand::FindLibrary(const char* name)
i != this->SearchPaths.end(); ++i) i != this->SearchPaths.end(); ++i)
{ {
std::string& p = *i; std::string& p = *i;
if(p[p.size()-1] != '/') if(p.empty() || p[p.size()-1] != '/')
{ {
p += "/"; p += "/";
} }

2
Source/cmFindPathCommand.cxx
View File

@ -106,7 +106,7 @@ bool cmFindPathCommand::InitialPass(std::vector<std::string> const& argsIn)
i != this->SearchPaths.end(); ++i) i != this->SearchPaths.end(); ++i)
{ {
std::string& p = *i; std::string& p = *i;
if(p[p.size()-1] != '/') if(p.empty() || p[p.size()-1] != '/')
{ {
p += "/"; p += "/";
} }

6
Source/kwsys/SystemTools.cxx
View File

@ -2117,7 +2117,7 @@ kwsys_stl::string SystemTools
i != path.end(); ++i) i != path.end(); ++i)
{ {
kwsys_stl::string& p = *i; kwsys_stl::string& p = *i;
if(p[p.size()-1] != '/') if(p.empty() || p[p.size()-1] != '/')
{ {
p += "/"; p += "/";
} }
@ -2249,7 +2249,7 @@ kwsys_stl::string SystemTools::FindProgram(
i != path.end(); ++i) i != path.end(); ++i)
{ {
kwsys_stl::string& p = *i; kwsys_stl::string& p = *i;
if(p[p.size()-1] != '/') if(p.empty() || p[p.size()-1] != '/')
{ {
p += "/"; p += "/";
} }
@ -2341,7 +2341,7 @@ kwsys_stl::string SystemTools
i != path.end(); ++i) i != path.end(); ++i)
{ {
kwsys_stl::string& p = *i; kwsys_stl::string& p = *i;
if(p[p.size()-1] != '/') if(p.empty() || p[p.size()-1] != '/')
{ {
p += "/"; p += "/";
} }