diff options
| -rw-r--r-- | lib/StaticAnalyzer/Checkers/Checkers.td | 2 | ||||
| -rw-r--r-- | lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp | 13 | ||||
| -rw-r--r-- | test/Analysis/keychainAPI.m | 3 |
3 files changed, 15 insertions, 3 deletions
diff --git a/lib/StaticAnalyzer/Checkers/Checkers.td b/lib/StaticAnalyzer/Checkers/Checkers.td index a450240286..fee689fd6f 100644 --- a/lib/StaticAnalyzer/Checkers/Checkers.td +++ b/lib/StaticAnalyzer/Checkers/Checkers.td @@ -281,7 +281,7 @@ def OSAtomicChecker : Checker<"AtomicCAS">, let ParentPackage = OSXExperimental in { def MacOSKeychainAPIChecker : Checker<"KeychainAPI">, - InPackage<OSX>, + InPackage<OSXExperimental>, HelpText<"Check for proper uses of Secure Keychain APIs">, DescFile<"MacOSKeychainAPIChecker.cpp">; diff --git a/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp b/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp index 3e80d9cc42..f9a43fdc3a 100644 --- a/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp +++ b/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp @@ -119,10 +119,21 @@ void MacOSKeychainAPIChecker::checkPostStmt(const CallExpr *CE, if (idx != InvalidParamVal) { SVal Param = State->getSVal(CE->getArg(idx)); if (const loc::MemRegionVal *X = dyn_cast<loc::MemRegionVal>(&Param)) { - SymbolRef V = SM.Retrieve (State->getStore(), *X).getAsSymbol(); + // Add the symbolic value, which represents the location of the allocated + // data, to the set. + SymbolRef V = SM.Retrieve(State->getStore(), *X).getAsSymbol(); if (!V) return; State = State->add<AllocatedData>(V); + + // We only need to track the value if the function returned noErr(0), so + // bind the return value of the function to 0. + SValBuilder &Builder = C.getSValBuilder(); + SVal ZeroVal = Builder.makeZeroVal(Builder.getContext().CharTy); + State = State->BindExpr(CE, ZeroVal); + assert(State); + + // Proceed from the new state. C.addTransition(State); } } diff --git a/test/Analysis/keychainAPI.m b/test/Analysis/keychainAPI.m index 85cc8eafaa..596984c69e 100644 --- a/test/Analysis/keychainAPI.m +++ b/test/Analysis/keychainAPI.m @@ -65,7 +65,8 @@ int foo () { void *outData; st = SecKeychainItemCopyContent(2, ptr, ptr, &length, &outData); - SecKeychainItemFreeContent(ptr, outData); + if (st == noErr) + SecKeychainItemFreeContent(ptr, outData); return 0; } |