mirror/cmake
1
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-01-26 19:09:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

foreach: Explicitly skip replay without iterations

Browse Source 
As written, foreach loops with a trailing `IN` (i.e., no loop
variable(s) given) lead to an assertion error. Handle this case by
exiting early when we know the loop won't execute anything.

Fixes: #27135
This commit is contained in:
Tyler Yankee 2025-08-13 15:22:28 -04:00
parent 5d2e715182
commit 37e27f71bc
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmForEachCommand.cxx
View File

@ -100,6 +100,9 @@ bool cmForEachFunctionBlocker::ArgumentsMatch(cmListFileFunction const& lff,
bool cmForEachFunctionBlocker::Replay(
std::vector<cmListFileFunction> functions, cmExecutionStatus& inStatus)
{
if (this->Args.size() == this->IterationVarsCount) {
return true;
}
return this->ZipLists ? this->ReplayZipLists(functions, inStatus)
: this->ReplayItems(functions, inStatus);
}

1
Tests/RunCMake/foreach/RunCMakeTest.cmake
View File

@ -22,3 +22,4 @@ run_cmake(foreach-RANGE-invalid-test)
run_cmake(foreach-RANGE-out-of-range-test)
run_cmake(foreach-var-scope-CMP0124-OLD)
run_cmake(foreach-var-scope-CMP0124-NEW)
run_cmake(TrailingIn)

1
Tests/RunCMake/foreach/TrailingIn-result.txt Normal file
View File

@ -0,0 +1 @@
0

5
Tests/RunCMake/foreach/TrailingIn.cmake Normal file
View File

@ -0,0 +1,5 @@
foreach(v IN)
endforeach()
foreach(v1 v2 IN)
endforeach()