[Cmake-commits] [cmake-commits] hoffman committed cmCommandArgumentParserHelper.cxx 1.24 1.25

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv30217

Modified Files:
	cmCommandArgumentParserHelper.cxx 
Log Message:
Fix seg fault for empty ENV{} call bug #9747


Index: cmCommandArgumentParserHelper.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCommandArgumentParserHelper.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** cmCommandArgumentParserHelper.cxx	28 Sep 2009 15:41:57 -0000	1.24
--- cmCommandArgumentParserHelper.cxx	21 Oct 2009 13:04:50 -0000	1.25
***************
*** 66,70 ****
      {
      return this->ExpandVariable(var);
!     } 
    if ( strcmp(key, "ENV") == 0 )
      {
--- 66,74 ----
      {
      return this->ExpandVariable(var);
!     }
!   if(!var)
!     {
!     return this->EmptyVariable;
!     }
    if ( strcmp(key, "ENV") == 0 )
      {