[Cmake-commits] CMake branch, next, updated. v2.8.3-716-g1c5f993
Brad King
brad.king at kitware.com
Tue Nov 30 08:45:38 EST 2010
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 1c5f9938acb4876fd182dc0fcece860f9793f907 (commit)
via 183d261b116decd6ab09a7d1a522a9ad4add47b4 (commit)
from 2b9f0dc4c869a63af7eac1326e79b3c35198b624 (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=1c5f9938acb4876fd182dc0fcece860f9793f907
commit 1c5f9938acb4876fd182dc0fcece860f9793f907
Merge: 2b9f0dc 183d261
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 30 08:45:31 2010 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 30 08:45:31 2010 -0500
Merge topic 'find-command-crash' into next
183d261 Fix find_* argument parsing crash (#11513)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=183d261b116decd6ab09a7d1a522a9ad4add47b4
commit 183d261b116decd6ab09a7d1a522a9ad4add47b4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 30 08:39:16 2010 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 30 08:39:16 2010 -0500
Fix find_* argument parsing crash (#11513)
Previously the command
find_path(VAR DOC "")
would crash because the argument pre-processing removed the DOC ""
arguments but the rest of the parsing assumes at least 2 arguments.
Reject the call with an error instead.
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 0416538..d0fe99f 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -164,6 +164,11 @@ bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn)
}
}
}
+ if(args.size() < 2 )
+ {
+ this->SetError("called with incorrect number of arguments");
+ return false;
+ }
this->VariableName = args[0];
if(this->CheckForVariableInCache())
{
-----------------------------------------------------------------------
Summary of changes:
Source/cmFindBase.cxx | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list