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

BUG: Fixed off-by-one error in ExpandVariablesInString for case of $ or @ as last character of string.

This commit is contained in:
Brad King 2001-08-02 14:10:19 -04:00
parent 9e5c769c29
commit ee12492c0a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmMakefile.cxx
View File

@ -823,8 +823,9 @@ void cmMakefile::ExpandVariablesInString(std::string& source,
// start by look for $ or @ in the string // start by look for $ or @ in the string
std::string::size_type markerPos = source.find_first_of("$@"); std::string::size_type markerPos = source.find_first_of("$@");
// if not found then leave quick as nothing needs to be expanded // if not found, or found as the last character, then leave quickly as
if(markerPos == std::string::npos && markerPos > source.size()-1) // nothing needs to be expanded
if((markerPos == std::string::npos) || (markerPos >= source.size()-1))
{ {
return; return;
} }
@ -832,14 +833,14 @@ void cmMakefile::ExpandVariablesInString(std::string& source,
std::string::size_type currentPos =0; // start at 0 std::string::size_type currentPos =0; // start at 0
std::string result; // string with replacements std::string result; // string with replacements
// go until the the end of the string // go until the the end of the string
while(markerPos != std::string::npos) while((markerPos != std::string::npos) && (markerPos < source.size()-1))
{ {
// grab string from currentPos to the start of the variable // grab string from currentPos to the start of the variable
// and add it to the result // and add it to the result
result += source.substr(currentPos, markerPos - currentPos); result += source.substr(currentPos, markerPos - currentPos);
char endVariableMarker; // what is the end of the variable @ or } char endVariableMarker; // what is the end of the variable @ or }
int markerStartSize = 1; // size of the start marker 1 or 2 int markerStartSize = 1; // size of the start marker 1 or 2
if(source[markerPos] == '$' ) if(source[markerPos] == '$')
{ {
// ${var} case // ${var} case
if(source[markerPos+1] == '{') if(source[markerPos+1] == '{')