1
0
Эх сурвалжийг харах

Merge topic 'linker-prefix-crash'

0fbc300bec cmComputeLinkInformation: Fix out-of-bounds read in error case

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !10207
Brad King 1 жил өмнө
parent
commit
abf249e63d

+ 5 - 2
Source/cmComputeLinkInformation.cxx

@@ -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;
   }