mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-25 01:28:50 -05:00
Merge topic 'linker-prefix-crash'
0fbc300bec cmComputeLinkInformation: Fix out-of-bounds read in error case
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10207
This commit is contained in:
@@ -1824,11 +1824,14 @@ void cmComputeLinkInformation::AddUserItem(LinkEntry const& entry)
|
||||
this->Items.emplace_back(item, ItemIsPath::No);
|
||||
return;
|
||||
}
|
||||
|
||||
if (cmHasPrefix(item.Value, LINKER)) {
|
||||
std::vector<BT<std::string>> linkerFlag{ 1, item };
|
||||
this->Target->ResolveLinkerWrapper(linkerFlag, this->GetLinkLanguage(),
|
||||
true);
|
||||
this->Items.emplace_back(linkerFlag.front(), ItemIsPath::No);
|
||||
/* joinItems = */ true);
|
||||
if (!linkerFlag.empty()) {
|
||||
this->Items.emplace_back(linkerFlag.front(), ItemIsPath::No);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user