[cfe-commits] r148375 - /cfe/trunk/lib/CodeGen/CodeGenModule.cpp

[Nick Lewycky]

Author: nicholas
Date: Tue Jan 17 21:41:19 2012
New Revision: 148375

URL: http://llvm.org/viewvc/llvm-project?rev=148375&view=rev
Log:
Fix a string over-run detected by ASAN.

Modified:
    cfe/trunk/lib/CodeGen/CodeGenModule.cpp

Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=148375&r1=148374&r2=148375&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Tue Jan 17 21:41:19 2012
@@ -883,8 +883,9 @@
       unsigned BuiltinID = FD->getBuiltinID();
       if (!BuiltinID)
         return true;
-      const char *BuiltinName = BI.GetName(BuiltinID) + strlen("__builtin_");
-      if (Name == BuiltinName) {
+      StringRef BuiltinName = BI.GetName(BuiltinID);
+      if (BuiltinName.startswith("__builtin_") &&
+          Name == BuiltinName.slice(strlen("__builtin_"), StringRef::npos)) {
         Result = true;
         return false;
       }