forked from OSchip/llvm-project
Fix use-after-free found in Clang's testsuite.
We need to discard all remaining cleanups if an earlier cleanup failed, otherwise we may try to rerun the remaining cleanups later, potentially after the scope containing the object is destroyed. (This can happen when checking a potential constant expression.) llvm-svn: 373042
This commit is contained in:
parent
3fcdd25ad5
commit
4949473353
|
@ -1239,11 +1239,14 @@ namespace {
|
|||
|
||||
// Run all cleanups for a block scope, and non-lifetime-extended cleanups
|
||||
// for a full-expression scope.
|
||||
bool Success = true;
|
||||
for (unsigned I = Info.CleanupStack.size(); I > OldStackSize; --I) {
|
||||
if (!(IsFullExpression &&
|
||||
Info.CleanupStack[I - 1].isLifetimeExtended())) {
|
||||
if (!Info.CleanupStack[I - 1].endLifetime(Info, RunDestructors))
|
||||
return false;
|
||||
if (!Info.CleanupStack[I - 1].endLifetime(Info, RunDestructors)) {
|
||||
Success = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1254,7 +1257,7 @@ namespace {
|
|||
std::remove_if(NewEnd, Info.CleanupStack.end(),
|
||||
[](Cleanup &C) { return !C.isLifetimeExtended(); });
|
||||
Info.CleanupStack.erase(NewEnd, Info.CleanupStack.end());
|
||||
return true;
|
||||
return Success;
|
||||
}
|
||||
};
|
||||
typedef ScopeRAII<false> BlockScopeRAII;
|
||||
|
|
Loading…
Reference in New Issue