summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2008-01-03 16:22:33 (GMT)
committerKen Martin <ken.martin@kitware.com>2008-01-03 16:22:33 (GMT)
commitac4c2f675a5607839a639d2297002c85351bfbe7 (patch)
treec859990e5578df97976d80ec535b8f81c250c1a9 /Source/cmMakefile.cxx
parentc61a3b6fe9580687458fc9687174a1acce4edf77 (diff)
downloadCMake-ac4c2f675a5607839a639d2297002c85351bfbe7.zip
CMake-ac4c2f675a5607839a639d2297002c85351bfbe7.tar.gz
CMake-ac4c2f675a5607839a639d2297002c85351bfbe7.tar.bz2
ENH: change raise_scope signature to be safer for returned varuables
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 49fc0f1..c74cf4d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2846,9 +2846,12 @@ void cmMakefile::PopScope()
this->DefinitionStack.pop_back();
}
-void cmMakefile::RaiseScope(const char *var)
+void cmMakefile::RaiseScope(const char *var, const char *varDef)
{
- const char *varDef = this->GetDefinition(var);
+ if (!var || !strlen(var))
+ {
+ return;
+ }
// multiple scopes in this directory?
if (this->DefinitionStack.size() > 1)