From 60d98befe8dc292148d7afaf4a996794096f11a3 Mon Sep 17 00:00:00 2001 From: Anna Zaks Date: Wed, 10 Apr 2013 22:06:29 +0000 Subject: [PATCH] [analyzer] Fix a crash in SyntaxCString checker when given a custom strncat. Fixes PR13476 llvm-svn: 179228 --- clang/lib/StaticAnalyzer/Checkers/CStringSyntaxChecker.cpp | 2 ++ clang/test/Analysis/cstring-syntax-cxx.cpp | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/clang/lib/StaticAnalyzer/Checkers/CStringSyntaxChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/CStringSyntaxChecker.cpp index 3a57a56..92c0eef 100644 --- a/clang/lib/StaticAnalyzer/Checkers/CStringSyntaxChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/CStringSyntaxChecker.cpp @@ -101,6 +101,8 @@ public: // - strncat(dst, src, sizeof(dst) - 1); // - strncat(dst, src, sizeof(dst)); bool WalkAST::containsBadStrncatPattern(const CallExpr *CE) { + if (CE->getNumArgs() != 3) + return false; const Expr *DstArg = CE->getArg(0); const Expr *SrcArg = CE->getArg(1); const Expr *LenArg = CE->getArg(2); diff --git a/clang/test/Analysis/cstring-syntax-cxx.cpp b/clang/test/Analysis/cstring-syntax-cxx.cpp index bae3d0a..39c978a 100644 --- a/clang/test/Analysis/cstring-syntax-cxx.cpp +++ b/clang/test/Analysis/cstring-syntax-cxx.cpp @@ -15,3 +15,8 @@ void test(X a, X b) { X c = a + b; } +// Ensure we don't crash on custom-defined strncat. +char strncat (); +int main () { + return strncat (); +} \ No newline at end of file -- 2.7.4