commit 9ed5b156a27a972ca1423aa25638f239cdc2ffc0
author Nick Lewycky <nicholas@mxc.ca> Wed Jan 18 03:41:19 2012 +0000
committer Nick Lewycky <nicholas@mxc.ca> Wed Jan 18 03:41:19 2012 +0000
tree 34d86d8ec8f444c5df09f6dba94bf805f8765f2e
parent 9cf080fba3bd8a72e119db43f8a05cf11ce709f0

Fix a string over-run detected by ASAN.

llvm-svn: 148375

clang/lib/CodeGen/CodeGenModule.cpp

diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 4f074eb..c2c4d08 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -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;
       }