[cfe-commits] r149525 - in /cfe/trunk: lib/StaticAnalyzer/Core/CheckerContext.cpp test/Analysis/cstring-syntax-cxx.cpp

[Anna Zaks]

Author: zaks
Date: Wed Feb  1 13:16:20 2012
New Revision: 149525

URL: http://llvm.org/viewvc/llvm-project?rev=149525&view=rev
Log:
[analyzer] Fix a crash in CheckerContext::isCLibraryFunction for C++
declarations with special names.

A patch by Dmitri Gribenko.

Added:
    cfe/trunk/test/Analysis/cstring-syntax-cxx.cpp
Modified:
    cfe/trunk/lib/StaticAnalyzer/Core/CheckerContext.cpp

Modified: cfe/trunk/lib/StaticAnalyzer/Core/CheckerContext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/CheckerContext.cpp?rev=149525&r1=149524&r2=149525&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/CheckerContext.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Core/CheckerContext.cpp Wed Feb  1 13:16:20 2012
@@ -53,7 +53,13 @@
       return true;
   }
 
-  StringRef FName = FD->getIdentifier()->getName();
+  const IdentifierInfo *II = FD->getIdentifier();
+  // If this is a special C++ name without IdentifierInfo, it can't be a
+  // C library function.
+  if (!II)
+    return false;
+
+  StringRef FName = II->getName();
   if (FName.startswith("__inline"))
     return (FName.find(Name) != StringRef::npos);
 

Added: cfe/trunk/test/Analysis/cstring-syntax-cxx.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/cstring-syntax-cxx.cpp?rev=149525&view=auto
==============================================================================
--- cfe/trunk/test/Analysis/cstring-syntax-cxx.cpp (added)
+++ cfe/trunk/test/Analysis/cstring-syntax-cxx.cpp Wed Feb  1 13:16:20 2012
@@ -0,0 +1,16 @@
+// RUN: %clang_cc1 -analyze -analyzer-checker=experimental.unix.cstring.BadSizeArg -analyzer-store=region -verify %s
+
+// Ensure we don't crash on C++ declarations with special names.
+struct X {
+  X(int i): i(i) {}
+  int i;
+};
+
+X operator+(X a, X b) {
+  return X(a.i + b.i);
+}
+
+void test(X a, X b) {
+  X c = a + b;
+}
+