summaryrefslogtreecommitdiffstats
path: root/Source/cmCommandArgumentParserHelper.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2009-10-28 16:17:18 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2009-10-28 16:17:18 (GMT)
commitb4ae8bad4b8e7810a44e2f77363de3009260a473 (patch)
tree7dd8a97d409c6339948ac4b3e0eda77cd9b7384e /Source/cmCommandArgumentParserHelper.cxx
parentebd0c2d3771835a1317c1fd70eafd3ebf2135b01 (diff)
downloadCMake-b4ae8bad4b8e7810a44e2f77363de3009260a473.zip
CMake-b4ae8bad4b8e7810a44e2f77363de3009260a473.tar.gz
CMake-b4ae8bad4b8e7810a44e2f77363de3009260a473.tar.bz2
RC 4 merge
Diffstat (limited to 'Source/cmCommandArgumentParserHelper.cxx')
-rw-r--r--Source/cmCommandArgumentParserHelper.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx
index ace67ec..234c37e 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -65,7 +65,11 @@ char* cmCommandArgumentParserHelper::ExpandSpecialVariable(const char* key,
if ( !key )
{
return this->ExpandVariable(var);
- }
+ }
+ if(!var)
+ {
+ return this->EmptyVariable;
+ }
if ( strcmp(key, "ENV") == 0 )
{
char *ptr = getenv(var);