forked from OSchip/llvm-project
Hoist diagnostic generation in ReturnStackAddressChecker into a separate method. No functionality change.
llvm-svn: 95037
This commit is contained in:
parent
9afa973203
commit
0059c491c1
|
@ -27,9 +27,11 @@ class ReturnStackAddressChecker :
|
||||||
public CheckerVisitor<ReturnStackAddressChecker> {
|
public CheckerVisitor<ReturnStackAddressChecker> {
|
||||||
BuiltinBug *BT;
|
BuiltinBug *BT;
|
||||||
public:
|
public:
|
||||||
ReturnStackAddressChecker() : BT(0) {}
|
ReturnStackAddressChecker() : BT(0) {}
|
||||||
static void *getTag();
|
static void *getTag();
|
||||||
void PreVisitReturnStmt(CheckerContext &C, const ReturnStmt *RS);
|
void PreVisitReturnStmt(CheckerContext &C, const ReturnStmt *RS);
|
||||||
|
private:
|
||||||
|
void EmitStackError(CheckerContext &C, const MemRegion *R, const Expr *RetE);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,6 +43,68 @@ void *ReturnStackAddressChecker::getTag() {
|
||||||
static int x = 0; return &x;
|
static int x = 0; return &x;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ReturnStackAddressChecker::EmitStackError(CheckerContext &C,
|
||||||
|
const MemRegion *R,
|
||||||
|
const Expr *RetE) {
|
||||||
|
ExplodedNode *N = C.GenerateSink();
|
||||||
|
|
||||||
|
if (!N)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!BT)
|
||||||
|
BT = new BuiltinBug("Return of address to stack-allocated memory");
|
||||||
|
|
||||||
|
// Generate a report for this bug.
|
||||||
|
llvm::SmallString<512> buf;
|
||||||
|
llvm::raw_svector_ostream os(buf);
|
||||||
|
SourceRange range;
|
||||||
|
|
||||||
|
// Get the base region, stripping away fields and elements.
|
||||||
|
R = R->getBaseRegion();
|
||||||
|
|
||||||
|
// Check if the region is a compound literal.
|
||||||
|
if (const CompoundLiteralRegion* CR = dyn_cast<CompoundLiteralRegion>(R)) {
|
||||||
|
const CompoundLiteralExpr* CL = CR->getLiteralExpr();
|
||||||
|
os << "Address of stack memory associated with a compound literal "
|
||||||
|
"declared on line "
|
||||||
|
<< C.getSourceManager().getInstantiationLineNumber(CL->getLocStart())
|
||||||
|
<< " returned to caller";
|
||||||
|
range = CL->getSourceRange();
|
||||||
|
}
|
||||||
|
else if (const AllocaRegion* AR = dyn_cast<AllocaRegion>(R)) {
|
||||||
|
const Expr* ARE = AR->getExpr();
|
||||||
|
SourceLocation L = ARE->getLocStart();
|
||||||
|
range = ARE->getSourceRange();
|
||||||
|
os << "Address of stack memory allocated by call to alloca() on line "
|
||||||
|
<< C.getSourceManager().getInstantiationLineNumber(L)
|
||||||
|
<< " returned to caller";
|
||||||
|
}
|
||||||
|
else if (const BlockDataRegion *BR = dyn_cast<BlockDataRegion>(R)) {
|
||||||
|
const BlockDecl *BD = BR->getCodeRegion()->getDecl();
|
||||||
|
SourceLocation L = BD->getLocStart();
|
||||||
|
range = BD->getSourceRange();
|
||||||
|
os << "Address of stack-allocated block declared on line "
|
||||||
|
<< C.getSourceManager().getInstantiationLineNumber(L)
|
||||||
|
<< " returned to caller";
|
||||||
|
}
|
||||||
|
else if (const VarRegion *VR = dyn_cast<VarRegion>(R)) {
|
||||||
|
os << "Address of stack memory associated with local variable '"
|
||||||
|
<< VR->getString() << "' returned";
|
||||||
|
range = VR->getDecl()->getSourceRange();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
assert(false && "Invalid region in ReturnStackAddressChecker.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
RangedBugReport *report = new RangedBugReport(*BT, os.str(), N);
|
||||||
|
report->addRange(RetE->getSourceRange());
|
||||||
|
if (range.isValid())
|
||||||
|
report->addRange(range);
|
||||||
|
|
||||||
|
C.EmitReport(report);
|
||||||
|
}
|
||||||
|
|
||||||
void ReturnStackAddressChecker::PreVisitReturnStmt(CheckerContext &C,
|
void ReturnStackAddressChecker::PreVisitReturnStmt(CheckerContext &C,
|
||||||
const ReturnStmt *RS) {
|
const ReturnStmt *RS) {
|
||||||
|
|
||||||
|
@ -54,61 +118,8 @@ void ReturnStackAddressChecker::PreVisitReturnStmt(CheckerContext &C,
|
||||||
if (!R || !R->hasStackStorage())
|
if (!R || !R->hasStackStorage())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ExplodedNode *N = C.GenerateSink();
|
if (R->hasStackStorage()) {
|
||||||
|
EmitStackError(C, R, RetE);
|
||||||
if (!N)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!BT)
|
|
||||||
BT = new BuiltinBug("Return of address to stack-allocated memory");
|
|
||||||
|
|
||||||
// Generate a report for this bug.
|
|
||||||
llvm::SmallString<100> buf;
|
|
||||||
llvm::raw_svector_ostream os(buf);
|
|
||||||
SourceRange range;
|
|
||||||
|
|
||||||
// Get the base region, stripping away fields and elements.
|
|
||||||
R = R->getBaseRegion();
|
|
||||||
|
|
||||||
// Check if the region is a compound literal.
|
|
||||||
if (const CompoundLiteralRegion* CR = dyn_cast<CompoundLiteralRegion>(R)) {
|
|
||||||
const CompoundLiteralExpr* CL = CR->getLiteralExpr();
|
|
||||||
os << "Address of stack memory associated with a compound literal "
|
|
||||||
"declared on line "
|
|
||||||
<< C.getSourceManager().getInstantiationLineNumber(CL->getLocStart())
|
|
||||||
<< " returned to caller";
|
|
||||||
range = CL->getSourceRange();
|
|
||||||
}
|
|
||||||
else if (const AllocaRegion* AR = dyn_cast<AllocaRegion>(R)) {
|
|
||||||
const Expr* ARE = AR->getExpr();
|
|
||||||
SourceLocation L = ARE->getLocStart();
|
|
||||||
range = ARE->getSourceRange();
|
|
||||||
os << "Address of stack memory allocated by call to alloca() on line "
|
|
||||||
<< C.getSourceManager().getInstantiationLineNumber(L)
|
|
||||||
<< " returned to caller";
|
|
||||||
}
|
|
||||||
else if (const BlockDataRegion *BR = dyn_cast<BlockDataRegion>(R)) {
|
|
||||||
const BlockDecl *BD = BR->getCodeRegion()->getDecl();
|
|
||||||
SourceLocation L = BD->getLocStart();
|
|
||||||
range = BD->getSourceRange();
|
|
||||||
os << "Address of stack-allocated block declared on line "
|
|
||||||
<< C.getSourceManager().getInstantiationLineNumber(L)
|
|
||||||
<< " returned to caller";
|
|
||||||
}
|
|
||||||
else if (const VarRegion *VR = dyn_cast<VarRegion>(R)) {
|
|
||||||
os << "Address of stack memory associated with local variable '"
|
|
||||||
<< VR->getString() << "' returned";
|
|
||||||
range = VR->getDecl()->getSourceRange();
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
assert(false && "Invalid region in ReturnStackAddressChecker.");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RangedBugReport *report = new RangedBugReport(*BT, os.str(), N);
|
|
||||||
report->addRange(RetE->getSourceRange());
|
|
||||||
if (range.isValid())
|
|
||||||
report->addRange(range);
|
|
||||||
|
|
||||||
C.EmitReport(report);
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue