nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dumb use-after-free bug introduced in r242868.

Browse Source 
llvm-svn: 242960
This commit is contained in:
Richard Smith
2015-07-22 22:51:15 +00:00
parent 00f512ebdf
commit 16fe4d178e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
clang/lib/Serialization/ModuleManager.cpp
View File

@@ -207,6 +207,15 @@ void ModuleManager::removeModules(
Roots.erase(std::remove_if(Roots.begin(), Roots.end(), IsVictim),
Roots.end());
// Remove the modules from the PCH chain.
for (auto I = first; I != last; ++I) {
if (!(*I)->isModule()) {
PCHChain.erase(std::find(PCHChain.begin(), PCHChain.end(), *I),
PCHChain.end());
break;
}
}
// Delete the modules and erase them from the various structures.
for (ModuleIterator victim = first; victim != last; ++victim) {
Modules.erase((*victim)->File);
@@ -229,15 +238,6 @@ void ModuleManager::removeModules(
// Remove the modules from the chain.
Chain.erase(first, last);
// Also remove them from the PCH chain.
for (auto I = first; I != last; ++I) {
if (!(*I)->isModule()) {
PCHChain.erase(std::find(PCHChain.begin(), PCHChain.end(), *I),
PCHChain.end());
break;
}
}
}
void