[Cmake-commits] CMake branch, next, updated. v3.1.0-1872-gd6c55ab

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d6c55abeac4d100edfa34fa2db5c50822f343705 (commit)
       via  ea916230efeb59938b04f9286a56ea9db1a3af6c (commit)
      from  84fa667ac294544aee9b0baed03f49776d6b1d1e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6c55abeac4d100edfa34fa2db5c50822f343705
commit d6c55abeac4d100edfa34fa2db5c50822f343705
Merge: 84fa667 ea91623
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 14 08:39:02 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 14 08:39:02 2015 -0500

    Merge topic 'backport-cpack_invalid_cmake_generator' into next
    
    ea916230 CPack: Avoid crash on invalid CMake generator name (#15308)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea916230efeb59938b04f9286a56ea9db1a3af6c
commit ea916230efeb59938b04f9286a56ea9db1a3af6c
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Jan 2 10:46:08 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 14 08:38:23 2015 -0500

    CPack: Avoid crash on invalid CMake generator name (#15308)
    
    Case where CPACK_CMAKE_GENERATOR value is non existent or
    or contains multiple words that were not quoted was not
    handled and produced a segmentation fault.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 1461bb1..84e6482 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -628,6 +628,14 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
       cmGlobalGenerator* globalGenerator
         = this->MakefileMap->GetCMakeInstance()->CreateGlobalGenerator(
           cmakeGenerator);
+      if ( !globalGenerator )
+      {
+      cmCPackLogger(cmCPackLog::LOG_ERROR,
+                    "Specified package generator not found. "
+                    "CPACK_CMAKE_GENERATOR value is invalid."
+                    << std::endl);
+      return 0;
+      }
       // set the global flag for unix style paths on cmSystemTools as
       // soon as the generator is set.  This allows gmake to be used
       // on windows.

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake