commit 176edba5311f6eff0cad2631449885ddf4fbc9ea
author Stephen Hines <srhines@google.com> Mon Dec 01 14:53:08 2014 -0800
committer Stephen Hines <srhines@google.com> Mon Dec 01 14:53:08 2014 -0800
tree f45baf023a7673970fc373bcdd0de5dc919905a1
parent 8b939a0498b8d24f4a5d7c6e6ac94ddba75ee933

Update aosp/master Clang for rebase to r222490.

Change-Id: Ic557ac55e97fbf6ee08771c7b7c3594777b0aefd

lib/Edit/EditedSource.cpp

diff --git a/lib/Edit/EditedSource.cpp b/lib/Edit/EditedSource.cpp
index 6cf6335..1c66cb8 100644
--- a/lib/Edit/EditedSource.cpp
+++ b/lib/Edit/EditedSource.cpp
@@ -280,6 +280,12 @@
   unsigned begin = offs.getOffset();
   unsigned end = begin + len;
 
+  // Do not try to extend the removal if we're at the end of the buffer already.
+  if (end == buffer.size())
+    return;
+
+  assert(begin < buffer.size() && end < buffer.size() && "Invalid range!");
+
   // FIXME: Remove newline.
 
   if (begin == 0) {