[PATCH] D14913: Fix a use-after-free in `llvm-config`.
Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Nov 25 14:52:32 PST 2015
This revision was automatically updated to reflect the committed changes.
Closed by commit rL254108: Fix a use-after-free in `llvm-config`. (authored by diamond).
Changed prior to commit:
http://reviews.llvm.org/D14913?vs=40898&id=41188#toc
Repository:
rL LLVM
http://reviews.llvm.org/D14913
Files:
llvm/trunk/tools/llvm-config/llvm-config.cpp
Index: llvm/trunk/tools/llvm-config/llvm-config.cpp
===================================================================
--- llvm/trunk/tools/llvm-config/llvm-config.cpp
+++ llvm/trunk/tools/llvm-config/llvm-config.cpp
@@ -56,10 +56,10 @@
/// libraries.
/// \param GetComponentNames - Get the component names instead of the
/// library name.
-static void VisitComponent(StringRef Name,
+static void VisitComponent(const std::string& Name,
const StringMap<AvailableComponent*> &ComponentMap,
std::set<AvailableComponent*> &VisitedComponents,
- std::vector<StringRef> &RequiredLibs,
+ std::vector<std::string> &RequiredLibs,
bool IncludeNonInstalled, bool GetComponentNames,
const std::string *ActiveLibDir, bool *HasMissing) {
// Lookup the component.
@@ -105,11 +105,11 @@
/// \param IncludeNonInstalled - Whether non-installed components should be
/// reported.
/// \param GetComponentNames - True if one would prefer the component names.
-static std::vector<StringRef>
+static std::vector<std::string>
ComputeLibsForComponents(const std::vector<StringRef> &Components,
bool IncludeNonInstalled, bool GetComponentNames,
const std::string *ActiveLibDir, bool *HasMissing) {
- std::vector<StringRef> RequiredLibs;
+ std::vector<std::string> RequiredLibs;
std::set<AvailableComponent *> VisitedComponents;
// Build a map of component names to information.
@@ -195,8 +195,8 @@
/// \brief Expand the semi-colon delimited LLVM_DYLIB_COMPONENTS into
/// the full list of components.
-std::vector<StringRef> GetAllDyLibComponents(const bool IsInDevelopmentTree,
- const bool GetComponentNames) {
+std::vector<std::string> GetAllDyLibComponents(const bool IsInDevelopmentTree,
+ const bool GetComponentNames) {
std::vector<StringRef> DyLibComponents;
StringRef DyLibComponentsStr(LLVM_DYLIB_COMPONENTS);
@@ -453,7 +453,7 @@
/// If there are missing static archives and a dylib was
/// built, print LLVM_DYLIB_COMPONENTS instead of everything
/// in the manifest.
- std::vector<StringRef> Components;
+ std::vector<std::string> Components;
for (unsigned j = 0; j != array_lengthof(AvailableComponents); ++j) {
// Only include non-installed components when in a development tree.
if (!AvailableComponents[j].IsInstalled && !IsInDevelopmentTree)
@@ -526,14 +526,14 @@
// Construct the list of all the required libraries.
bool HasMissing = false;
- std::vector<StringRef> RequiredLibs =
+ std::vector<std::string> RequiredLibs =
ComputeLibsForComponents(Components,
/*IncludeNonInstalled=*/IsInDevelopmentTree,
false, &ActiveLibDir, &HasMissing);
if (PrintSharedMode) {
std::unordered_set<std::string> FullDyLibComponents;
- std::vector<StringRef> DyLibComponents =
+ std::vector<std::string> DyLibComponents =
GetAllDyLibComponents(IsInDevelopmentTree, false);
for (auto &Component : DyLibComponents) {
@@ -585,7 +585,7 @@
PrintForLib(DyLibName, true);
} else {
for (unsigned i = 0, e = RequiredLibs.size(); i != e; ++i) {
- StringRef Lib = RequiredLibs[i];
+ auto Lib = RequiredLibs[i];
if (i)
OS << ' ';
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D14913.41188.patch
Type: text/x-patch
Size: 3612 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151125/b01dc18e/attachment-0001.bin>
More information about the llvm-commits
mailing list