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

Fix potential crash in ObjCContainersChecker by properly validating 

the number of arguments.

llvm-svn: 165838
This commit is contained in:
Ted Kremenek 2012-10-12 22:56:36 +00:00
parent bd1d7fa460
commit d0b9770399
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,6 +105,8 @@ void WalkAST::VisitCallExpr(CallExpr *CE) {
unsigned ArgNum = InvalidArgIndex; unsigned ArgNum = InvalidArgIndex;
if (Name.equals("CFArrayCreate") || Name.equals("CFSetCreate")) { if (Name.equals("CFArrayCreate") || Name.equals("CFSetCreate")) {
if (CE->getNumArgs() != 4)
return;
ArgNum = 1; ArgNum = 1;
Arg = CE->getArg(ArgNum)->IgnoreParenCasts(); Arg = CE->getArg(ArgNum)->IgnoreParenCasts();
if (hasPointerToPointerSizedType(Arg)) if (hasPointerToPointerSizedType(Arg))
@ -112,6 +114,8 @@ void WalkAST::VisitCallExpr(CallExpr *CE) {
} }
if (Arg == 0 && Name.equals("CFDictionaryCreate")) { if (Arg == 0 && Name.equals("CFDictionaryCreate")) {
if (CE->getNumArgs() != 6)
return;
// Check first argument. // Check first argument.
ArgNum = 1; ArgNum = 1;
Arg = CE->getArg(ArgNum)->IgnoreParenCasts(); Arg = CE->getArg(ArgNum)->IgnoreParenCasts();
@ -127,6 +131,7 @@ void WalkAST::VisitCallExpr(CallExpr *CE) {
if (ArgNum != InvalidArgIndex) { if (ArgNum != InvalidArgIndex) {
assert(ArgNum == 1 || ArgNum == 2); assert(ArgNum == 1 || ArgNum == 2);
assert(Arg);
SmallString<256> BufName; SmallString<256> BufName;
llvm::raw_svector_ostream OsName(BufName); llvm::raw_svector_ostream OsName(BufName);