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

COMP: fix possible poroblem with freed memory

Browse Source
This commit is contained in:
Ken Martin 2005-06-22 14:16:18 -04:00
parent 6e6bfc752b
commit de89c6fa69
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmForEachCommand.cxx
View File

@ -34,7 +34,11 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf)
if(!expandedArguments.empty() && (expandedArguments[0] == m_Args[0])) if(!expandedArguments.empty() && (expandedArguments[0] == m_Args[0]))
{ {
// store the old value // store the old value
const char *oldDef = mf.GetDefinition(m_Args[0].c_str()); std::string oldDef;
if (mf.GetDefinition(m_Args[0].c_str()))
{
oldDef = mf.GetDefinition(m_Args[0].c_str());
}
m_Executing = true; m_Executing = true;
std::vector<std::string>::const_iterator j = m_Args.begin(); std::vector<std::string>::const_iterator j = m_Args.begin();
++j; ++j;
@ -52,7 +56,7 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf)
} }
} }
// restore the variable to its prior value // restore the variable to its prior value
mf.AddDefinition(m_Args[0].c_str(),oldDef); mf.AddDefinition(m_Args[0].c_str(),oldDef.c_str());
mf.RemoveFunctionBlocker(lff); mf.RemoveFunctionBlocker(lff);
return true; return true;
} }