[Cmake-commits] CMake branch, next, updated. v2.8.12-4877-g15d47f3

[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  15d47f30f7db309ea6c92d9c5d954a6d5ee48f28 (commit)
       via  132c40a8a89f701bc4cf4de8a716b5d02233d151 (commit)
       via  cc52b7d5f950a942f5477a7aaa86fb86e0cc37fe (commit)
       via  9ef66f2b0fc86e1a4c2ae532cbb32db137ef5ffe (commit)
      from  38140e304a3720d22184b0020e117df48575e867 (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=15d47f30f7db309ea6c92d9c5d954a6d5ee48f28
commit 15d47f30f7db309ea6c92d9c5d954a6d5ee48f28
Merge: 38140e3 132c40a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 5 07:44:08 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 5 07:44:08 2013 -0500

    Merge topic 'cmake-E-autogen-crash' into next
    
    132c40a cmake: Validate -E cmake_autogen argument count (#14545)
    cc52b7d Merge branch 'cmake-E-automoc-crash' into cmake-E-autogen-crash
    9ef66f2 cmake: Validate -E cmake_automoc argument count (#14545)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=132c40a8a89f701bc4cf4de8a716b5d02233d151
commit 132c40a8a89f701bc4cf4de8a716b5d02233d151
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 5 07:39:45 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 5 07:39:45 2013 -0500

    cmake: Validate -E cmake_autogen argument count (#14545)
    
    Do not access an argument index not known to exist.
    
    Port the change from commit 9ef66f2b (cmake: Validate -E cmake_automoc
    argument count, 2013-11-05) to the new location of the code.

diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 26251b3..d4f464c 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -632,7 +632,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       {
       return cmcmd::ExecuteEchoColor(args);
       }
-    else if (args[1] == "cmake_autogen")
+    else if (args[1] == "cmake_autogen" && args.size() >= 4)
       {
         cmQtAutoGenerators autogen;
         const char *config = args[3].empty() ? 0 : args[3].c_str();

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc52b7d5f950a942f5477a7aaa86fb86e0cc37fe
commit cc52b7d5f950a942f5477a7aaa86fb86e0cc37fe
Merge: 47694c4 9ef66f2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 5 07:38:51 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 5 07:38:51 2013 -0500

    Merge branch 'cmake-E-automoc-crash' into cmake-E-autogen-crash


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ef66f2b0fc86e1a4c2ae532cbb32db137ef5ffe
commit 9ef66f2b0fc86e1a4c2ae532cbb32db137ef5ffe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 5 07:37:23 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 5 07:37:23 2013 -0500

    cmake: Validate -E cmake_automoc argument count (#14545)
    
    Do not access an argument index not known to exist.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 290aff0..14ddc1b 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1734,7 +1734,7 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
       {
       return cmake::ExecuteEchoColor(args);
       }
-    else if (args[1] == "cmake_automoc")
+    else if (args[1] == "cmake_automoc" && args.size() >= 4)
       {
         cmQtAutomoc automoc;
         const char *config = args[3].empty() ? 0 : args[3].c_str();

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

Summary of changes:
 Source/cmcmd.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake