RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-02-23 14:30:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a use-after-free in llvm-config.

Browse Source 
Summary:
This could happen if `GetComponentNames` is true, because `Name` from
`VisitComponent` would reference a stack instance of `std::string` in
`ComputeLibsForComponents`.

Reviewers: beanz

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D14913

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@254108 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Richard Diamond 2015-11-25 22:49:48 +00:00
parent d5a489c812
commit 5efecd1377
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/llvm-config/llvm-config.cpp
View File

@ -56,10 +56,10 @@ using namespace llvm;
/// 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 @@ static void VisitComponent(StringRef Name,
/// \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 @@ std::string GetExecutablePath(const char *Argv0) {
/// \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 @@ int main(int argc, char **argv) {
/// 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 @@ int main(int argc, char **argv) {
// 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 @@ int main(int argc, char **argv) {
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 << ' ';