This is an archive of the discontinued LLVM Phabricator instance.

Differential D25983

Fix use-after-free in ASTContext.
ClosedPublic

Authored by sammccall on Oct 26 2016, 5:46 AM.

Details

Reviewers
bkramer
Commits
rG3f515cd79587: Fix use-after-scope in ASTContext.
rC285192: Fix use-after-scope in ASTContext.
rL285192: Fix use-after-scope in ASTContext.
Summary

Extend lifetime of ExceptionTypeStorage, as it is referenced by
CanonicalEPI and used outside the block (ExceptionSpec.Exceptions is an ArrayRef)

Diff Detail

Event Timeline

sammccall updated this revision to Diff 75860.Oct 26 2016, 5:46 AM
sammccall retitled this revision from to Fix use-after-free in ASTContext..
sammccall updated this object.
sammccall added a reviewer: bkramer.
sammccall added subscribers: cfe-commits, rsmith.
bkramer accepted this revision.Oct 26 2016, 6:00 AM
bkramer edited edge metadata.
This revision is now accepted and ready to land.Oct 26 2016, 6:00 AM
Closed by commit rL285192: Fix use-after-scope in ASTContext. (authored by d0k). · Explain WhyOct 26 2016, 6:01 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
AST/
2 lines

Diff 75860

lib/AST/ASTContext.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 3,224 Lines • ▼ Show 20 LinesQualType ASTContext::getFunctionTypeInternal(
// already have it. The exception spec is only partially part of the // already have it. The exception spec is only partially part of the
// canonical type, and only in C++17 onwards. // canonical type, and only in C++17 onwards.
if (!isCanonical && Canonical.isNull()) { if (!isCanonical && Canonical.isNull()) {
SmallVector<QualType, 16> CanonicalArgs; SmallVector<QualType, 16> CanonicalArgs;
CanonicalArgs.reserve(NumArgs); CanonicalArgs.reserve(NumArgs);
for (unsigned i = 0; i != NumArgs; ++i) for (unsigned i = 0; i != NumArgs; ++i)
CanonicalArgs.push_back(getCanonicalParamType(ArgArray[i])); CanonicalArgs.push_back(getCanonicalParamType(ArgArray[i]));
llvm::SmallVector<QualType, 8> ExceptionTypeStorage;
FunctionProtoType::ExtProtoInfo CanonicalEPI = EPI; FunctionProtoType::ExtProtoInfo CanonicalEPI = EPI;
CanonicalEPI.HasTrailingReturn = false; CanonicalEPI.HasTrailingReturn = false;
if (IsCanonicalExceptionSpec) { if (IsCanonicalExceptionSpec) {
// Exception spec is already OK. // Exception spec is already OK.
} else if (NoexceptInType) { } else if (NoexceptInType) {
llvm::SmallVector<QualType, 8> ExceptionTypeStorage;
switch (EPI.ExceptionSpec.Type) { switch (EPI.ExceptionSpec.Type) {
case EST_Unparsed: case EST_Unevaluated: case EST_Uninstantiated: case EST_Unparsed: case EST_Unevaluated: case EST_Uninstantiated:
// We don't know yet. It shouldn't matter what we pick here; no-one // We don't know yet. It shouldn't matter what we pick here; no-one
// should ever look at this. // should ever look at this.
LLVM_FALLTHROUGH; LLVM_FALLTHROUGH;
case EST_None: case EST_MSAny: case EST_None: case EST_MSAny:
CanonicalEPI.ExceptionSpec.Type = EST_None; CanonicalEPI.ExceptionSpec.Type = EST_None;
break; break;
▲ Show 20 Lines • Show All 6,192 Lines • Show Last 20 Lines