commit 58878f85ab89b13e9eea4af3ccf055e42c557bc8
author Pirama Arumuga Nainar <pirama@google.com> Wed May 06 11:48:57 2015 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Wed May 06 11:48:57 2015 -0700
tree 3bf522a2cb819d02935c537ee23c8604b9e3f807
parent 13cb65defa5e5c4578d83b4f3ca5bdfc08a4e06f

Update aosp/master clang for rebase to r235153

Change-Id: Ia94bbcb6da7c75b6e7c2afedd1001094d62a7324

lib/Edit/EditedSource.cpp

diff --git a/lib/Edit/EditedSource.cpp b/lib/Edit/EditedSource.cpp
index a5b5875..e557de9 100644
--- a/lib/Edit/EditedSource.cpp
+++ b/lib/Edit/EditedSource.cpp
@@ -295,9 +295,11 @@
   }
 
   if (buffer[end] == ' ') {
+    assert((end + 1 != buffer.size() || buffer.data()[end + 1] == 0) &&
+           "buffer not zero-terminated!");
     if (canRemoveWhitespace(/*left=*/buffer[begin-1],
                             /*beforeWSpace=*/buffer[end-1],
-                            /*right=*/buffer[end+1],
+                            /*right=*/buffer.data()[end + 1], // zero-terminated
                             LangOpts))
       ++len;
     return;