[cmake-commits] hoffman committed cmMacroCommand.cxx 1.30 1.31

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Dec 1 10:30:16 EST 2006


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

Modified Files:
	cmMacroCommand.cxx 
Log Message:
BUG: fix for 3815 seg fault


Index: cmMacroCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMacroCommand.cxx,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- cmMacroCommand.cxx	3 Oct 2006 16:09:47 -0000	1.30
+++ cmMacroCommand.cxx	1 Dec 2006 15:30:11 -0000	1.31
@@ -235,14 +235,20 @@
       }
     if(!this->Makefile->ExecuteCommand(newLFF))
       {
-      const char* filePath = args[0].FilePath;
-      if(!filePath)
+      cmListFileArgument arg;
+      if(args.size())
         {
-        filePath = "Unknown";
+        arg.FilePath = args[0].FilePath;
+        arg.Line = args[0].Line;
+        }
+      else
+        {
+        arg.FilePath =  "Unknown";
+        arg.Line = 0;
         }
       cmOStringStream error;
       error << "Error in cmake code at\n"
-            << filePath << ":" << args[0].Line << ":\n"
+            << arg.FilePath << ":" << arg.Line << ":\n"
             << "A command failed during the invocation of macro \""
             << this->Args[0].c_str() << "\".";
       cmSystemTools::Error(error.str().c_str());



More information about the Cmake-commits mailing list