retain/release checker: Fix crasher when the leak site is the same expression that allocates an object.

llvm-svn: 65047
This commit is contained in:
Ted Kremenek 2009-02-19 18:18:48 +00:00
parent 780b46fd50
commit deafc5c601
1 changed files with 20 additions and 12 deletions

View File

@ -2586,7 +2586,6 @@ CFRefLeakReport::getEndPath(BugReporter& br, const ExplodedNode<GRState>* EndN){
while (LeakN) {
ProgramPoint P = LeakN->getLocation();
if (const PostStmt *PS = dyn_cast<PostStmt>(&P))
S = PS->getStmt();
@ -2597,18 +2596,27 @@ CFRefLeakReport::getEndPath(BugReporter& br, const ExplodedNode<GRState>* EndN){
// Scan 'S' for uses of Sym.
GRStateRef state(LeakN->getState(), BR.getStateManager());
bool foundSymbol = false;
for (Stmt::child_iterator I=S->child_begin(), E=S->child_end();
I!=E; ++I)
if (Expr *Ex = dyn_cast_or_null<Expr>(*I)) {
SVal X = state.GetSVal(Ex);
if (isa<loc::SymbolVal>(X) &&
cast<loc::SymbolVal>(X).getSymbol() == Sym){
foundSymbol = true;
break;
// First check if 'S' itself binds to the symbol.
if (Expr *Ex = dyn_cast<Expr>(S)) {
SVal X = state.GetSVal(Ex);
if (isa<loc::SymbolVal>(X) &&
cast<loc::SymbolVal>(X).getSymbol() == Sym)
foundSymbol = true;
}
if (!foundSymbol)
for (Stmt::child_iterator I=S->child_begin(), E=S->child_end();
I!=E; ++I)
if (Expr *Ex = dyn_cast_or_null<Expr>(*I)) {
SVal X = state.GetSVal(Ex);
if (isa<loc::SymbolVal>(X) &&
cast<loc::SymbolVal>(X).getSymbol() == Sym){
foundSymbol = true;
break;
}
}
}
if (foundSymbol)
break;
}