[Cmake-commits] CMake branch, next, updated. v2.8.8-3429-gf11d76d
Peter Kuemmel
syntheticpp at gmx.net
Tue Jul 10 10:50:58 EDT 2012
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 f11d76d6156c651c44066c2b276f5aad359d0ff2 (commit)
via bede9ead46194db421647ae849f38747b7ca4525 (commit)
from 3d819053cb3c19ee8ab39f62360e9f600ac77df0 (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=f11d76d6156c651c44066c2b276f5aad359d0ff2
commit f11d76d6156c651c44066c2b276f5aad359d0ff2
Merge: 3d81905 bede9ea
Author: Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jul 10 10:50:41 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 10 10:50:41 2012 -0400
Merge topic 'include-command-empty-filename' into next
bede9ea 'include' must not be called with empty file name
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bede9ead46194db421647ae849f38747b7ca4525
commit bede9ead46194db421647ae849f38747b7ca4525
Author: Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Tue Jul 10 16:47:56 2012 +0200
Commit: Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Tue Jul 10 16:47:56 2012 +0200
'include' must not be called with empty file name
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index d6fdb71..520f334 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -78,6 +78,13 @@ bool cmIncludeCommand
}
}
+ if (fname.empty())
+ {
+ this->SetError("called with empty file name.");
+ cmSystemTools::SetFatalErrorOccured();
+ return false;
+ }
+
if(!cmSystemTools::FileIsFullPath(fname.c_str()))
{
// Not a path. Maybe module.
-----------------------------------------------------------------------
Summary of changes:
Source/cmIncludeCommand.cxx | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list