BUG: Pop a function scope even on error

This uses an automatic variable to push and pop variable scope inside a
function call.  Previously if the function failed its scope would not be
popped.  This approach guarantees a balanced push/pop.

1 files changed, 2 insertions, 3 deletions

diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 8bad1a4565..f36eb7477e 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -104,7 +104,8 @@ bool cmFunctionHelperCommand::InvokeInitialPass
     }
 
   // we push a scope on the makefile
-  this->Makefile->PushScope();
+  cmMakefile::ScopePushPop varScope(this->Makefile);
+  static_cast<void>(varScope);
 
   // set the value of argc
   cmOStringStream strStream;
@@ -167,13 +168,11 @@ bool cmFunctionHelperCommand::InvokeInitialPass
       }
     if (status.GetReturnInvoked())
       {
-      this->Makefile->PopScope();
       return true;
       }
     }
 
   // pop scope on the makefile
-  this->Makefile->PopScope();
   return true;
 }