mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-03 04:10:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ccmake-fix-infinite-loop-search' into release-3.23

Browse Source 
432a8ab739 ccmake: Fix infinite loop during invalid search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7269
This commit is contained in:
Brad King
2022-05-18 12:43:24 +00:00
committed by Kitware Robot
parent 44ccfdbe0b 432a8ab739
commit 640268c19b
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/CursesDialog/cmCursesMainForm.cxx
View File

@@ -95,9 +95,10 @@ void cmCursesMainForm::InitializeUI()
// Add a label to display when cache is empty
// dummy entry widget (does not respond to input)
cmCursesCacheEntryComposite comp("EMPTY CACHE", 30, 30);
comp.Entry = cm::make_unique<cmCursesDummyWidget>(1, 1, 1, 1);
newEntries.emplace_back(std::move(comp));
this->EmptyCacheEntry =
cm::make_unique<cmCursesCacheEntryComposite>("EMPTY CACHE", 30, 30);
this->EmptyCacheEntry->Entry =
cm::make_unique<cmCursesDummyWidget>(1, 1, 1, 1);
if (count > 0) {
// Create the composites.
@@ -192,10 +193,9 @@ void cmCursesMainForm::RePost()
// if no cache entries there should still be one dummy field
this->IsEmpty = this->Fields.empty();
if (this->IsEmpty) {
const auto& front = this->Entries.front();
this->Fields.push_back(front.Label->Field);
this->Fields.push_back(front.IsNewLabel->Field);
this->Fields.push_back(front.Entry->Field);
this->Fields.push_back(this->EmptyCacheEntry->Label->Field);
this->Fields.push_back(this->EmptyCacheEntry->IsNewLabel->Field);
this->Fields.push_back(this->EmptyCacheEntry->Entry->Field);
this->NumberOfVisibleEntries = 1;
}
// Has to be null terminated.

1
Source/CursesDialog/cmCursesMainForm.h
View File

@@ -162,6 +162,7 @@ protected:
// Number of pages displayed
int NumberOfPages = 0;
bool IsEmpty = false;
std::unique_ptr<cmCursesCacheEntryComposite> EmptyCacheEntry;
int InitialWidth;
std::unique_ptr<cmake> CMakeInstance;