diff options
| -rw-r--r-- | lib/Analysis/CFRefCount.cpp | 7 | ||||
| -rw-r--r-- | test/Analysis/NSString.m | 31 |
2 files changed, 33 insertions, 5 deletions
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index fc6de60032..c31a8cd53d 100644 --- a/lib/Analysis/CFRefCount.cpp +++ b/lib/Analysis/CFRefCount.cpp @@ -2154,6 +2154,9 @@ PathDiagnosticPiece* CFRefReport::VisitNode(const ExplodedNode<GRState>* N, const ExplodedNode<GRState>* PrevN, BugReporterContext& BRC) { + if (!isa<PostStmt>(N->getLocation())) + return NULL; + // Check if the type state has changed. GRStateManager &StMgr = BRC.getStateManager(); GRStateRef PrevSt(PrevN->getState(), StMgr); @@ -2373,8 +2376,8 @@ PathDiagnosticPiece* CFRefReport::VisitNode(const ExplodedNode<GRState>* N, if (os.str().empty()) return 0; // We have nothing to say! - - Stmt* S = cast<PostStmt>(N->getLocation()).getStmt(); + + Stmt* S = cast<PostStmt>(N->getLocation()).getStmt(); PathDiagnosticLocation Pos(S, BRC.getSourceManager()); PathDiagnosticPiece* P = new PathDiagnosticEventPiece(Pos, os.str()); diff --git a/test/Analysis/NSString.m b/test/Analysis/NSString.m index d5a7870a99..44d0a5d962 100644 --- a/test/Analysis/NSString.m +++ b/test/Analysis/NSString.m @@ -183,6 +183,33 @@ void f13(void) { NSString *str = [[NSString alloc] init]; return [str autorelease]; // no-warning } +- (void)m1 +{ + NSString *s = [[NSString alloc] init]; // expected-warning{{leak}} + [s retain]; + [s autorelease]; +} +- (void)m2 +{ + NSString *s = [[[NSString alloc] init] autorelease]; // expected-warning{{leak}} + [s retain]; +} +- (void)m3 +{ + NSString *s = [[[NSString alloc] init] autorelease]; + [s retain]; + [s autorelease]; +} +- (void)m4 +{ + NSString *s = [[NSString alloc] init]; // expected-warning{{leak}} + [s retain]; +} +- (void)m5 +{ + NSString *s = [[NSString alloc] init]; + [s autorelease]; +} @end @interface C1 : NSObject {} @@ -298,8 +325,6 @@ void test_isTrackedObjectType(void) { return CFStringCreateWithFormat(kCFAllocatorDefault, ((void*)0), ((CFStringRef) __builtin___CFStringMakeConstantString ("" "%d" "")), 100); // expected-warning{{leak}} } - - // Test @synchronized void test_synchronized(id x) { @synchronized(x) { @@ -307,4 +332,4 @@ void test_synchronized(id x) { } } -// Test return from method starting with 'new' or 'copy' + |