mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-20 06:48:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

file: Fix crash on GLOB with no expressions after LIST_DIRECTORIES

Browse Source 
Since commit v3.3.0-rc1~318^2~1 (file: Teach GLOB to list directories
optionally, 2015-03-17) using `LIST_DIRECTORIES` followed by no
expression causes a crash.  Fix the logic to avoid the crash.

Fixes: #16565
This commit is contained in:
Brad King
2017-01-16 10:37:42 -05:00
parent 85a8939e2f
commit 2bba0bfc2c
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmFileCommand.cxx
+1 -1
View File
@@ -788,7 +788,7 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args,
this->SetError("LIST_DIRECTORIES missing bool value."); this->SetError("LIST_DIRECTORIES missing bool value.");
return false; return false;
} }
++i; continue;
} }
if (recurse && (*i == "FOLLOW_SYMLINKS")) { if (recurse && (*i == "FOLLOW_SYMLINKS")) {
Tests/RunCMake/file/GLOB-noexp-LIST_DIRECTORIES.cmake
+1
View File
@@ -0,0 +1 @@
file(GLOB CONTENT_LIST LIST_DIRECTORIES false)
Tests/RunCMake/file/RunCMakeTest.cmake
+1
View File
@@ -31,6 +31,7 @@ run_cmake(GLOB_RECURSE)
run_cmake(GLOB-error-LIST_DIRECTORIES-not-boolean) run_cmake(GLOB-error-LIST_DIRECTORIES-not-boolean)
# test is valid both for GLOB and GLOB_RECURSE # test is valid both for GLOB and GLOB_RECURSE
run_cmake(GLOB-error-LIST_DIRECTORIES-no-arg) run_cmake(GLOB-error-LIST_DIRECTORIES-no-arg)
run_cmake(GLOB-noexp-LIST_DIRECTORIES)
if(NOT WIN32 OR CYGWIN) if(NOT WIN32 OR CYGWIN)
run_cmake(GLOB_RECURSE-cyclic-recursion) run_cmake(GLOB_RECURSE-cyclic-recursion)