Fix bad iterator access.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@248375 91177308-0d34-0410-b5e6-96231b3b80d8
r0mai · Sep 23, 2015 · 0f5f6df · 0f5f6df
1 parent 575a21a
commit 0f5f6df
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/Tooling/Core/Replacement.cpp b/lib/Tooling/Core/Replacement.cpp
@@ -405,7 +405,8 @@ Replacements mergeReplacements(const Replacements &First,
   for (auto FirstI = First.begin(), SecondI = Second.begin();
        FirstI != First.end() || SecondI != Second.end();) {
     bool NextIsFirst = SecondI == Second.end() ||
-                       FirstI->getOffset() < SecondI->getOffset() + Delta;
+                       (FirstI != First.end() &&
+                        FirstI->getOffset() < SecondI->getOffset() + Delta);
     MergedReplacement Merged(NextIsFirst ? *FirstI : *SecondI, NextIsFirst,
                              Delta);
     ++(NextIsFirst ? FirstI : SecondI);