maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[analyzer] ObjCContainersASTChecker: minor cleanup and an extra test case. 

Follow-up to r165838, which fixed a potential crash.

llvm-svn: 166002
This commit is contained in:
Jordan Rose 2012-10-16 00:47:25 +00:00
parent d9d4be0d57
commit 968a1b58fa
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/StaticAnalyzer/Checkers/ObjCContainersASTChecker.cpp
View File

@ -31,8 +31,6 @@ class WalkAST : public StmtVisitor<WalkAST> {
ASTContext &ASTC; ASTContext &ASTC;
uint64_t PtrWidth; uint64_t PtrWidth;
static const unsigned InvalidArgIndex = UINT_MAX;
/// Check if the type has pointer size (very conservative). /// Check if the type has pointer size (very conservative).
inline bool isPointerSize(const Type *T) { inline bool isPointerSize(const Type *T) {
if (!T) if (!T)
@ -102,7 +100,7 @@ void WalkAST::VisitCallExpr(CallExpr *CE) {
return; return;
const Expr *Arg = 0; const Expr *Arg = 0;
unsigned ArgNum = InvalidArgIndex; unsigned ArgNum;
if (Name.equals("CFArrayCreate") || Name.equals("CFSetCreate")) { if (Name.equals("CFArrayCreate") || Name.equals("CFSetCreate")) {
if (CE->getNumArgs() != 4) if (CE->getNumArgs() != 4)
@ -111,9 +109,7 @@ void WalkAST::VisitCallExpr(CallExpr *CE) {
Arg = CE->getArg(ArgNum)->IgnoreParenCasts(); Arg = CE->getArg(ArgNum)->IgnoreParenCasts();
if (hasPointerToPointerSizedType(Arg)) if (hasPointerToPointerSizedType(Arg))
return; return;
} } else if (Name.equals("CFDictionaryCreate")) {
if (Arg == 0 && Name.equals("CFDictionaryCreate")) {
if (CE->getNumArgs() != 6) if (CE->getNumArgs() != 6)
return; return;
// Check first argument. // Check first argument.
@ -129,13 +125,11 @@ void WalkAST::VisitCallExpr(CallExpr *CE) {
} }
} }
if (ArgNum != InvalidArgIndex) { if (Arg) {
assert(ArgNum == 1 || ArgNum == 2); assert(ArgNum == 1 || ArgNum == 2);
assert(Arg);
SmallString<256> BufName; SmallString<64> BufName;
llvm::raw_svector_ostream OsName(BufName); llvm::raw_svector_ostream OsName(BufName);
assert(ArgNum == 1 || ArgNum == 2);
OsName << " Invalid use of '" << Name << "'" ; OsName << " Invalid use of '" << Name << "'" ;
SmallString<256> Buf; SmallString<256> Buf;

19
clang/test/Analysis/CFContainers-invalid.c Normal file
View File

@ -0,0 +1,19 @@
// RUN: %clang_cc1 -analyze -analyzer-checker=osx.coreFoundation.containers.PointerSizedValues -triple x86_64-apple-darwin -verify %s
typedef const struct __CFAllocator * CFAllocatorRef;
typedef const struct __CFArray * CFArrayRef;
typedef const struct __CFDictionary * CFDictionaryRef;
typedef const struct __CFSet * CFSetRef;
extern const CFAllocatorRef kCFAllocatorDefault;
// Unexpected declarations for these:
CFArrayRef CFArrayCreate(CFAllocatorRef);
CFDictionaryRef CFDictionaryCreate(CFAllocatorRef);
CFSetRef CFSetCreate(CFAllocatorRef);
void testNoCrash() {
(void)CFArrayCreate(kCFAllocatorDefault);
(void)CFDictionaryCreate(kCFAllocatorDefault);
(void)CFSetCreate(kCFAllocatorDefault);
}