Fix PR13394: Erasing from a vector changes the end of the vector, so make sure we always have the right end.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160855 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 19 insertions, 3 deletions

diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp
index e280705449..dad196b410 100644
--- a/lib/Sema/SemaLookup.cpp
+++ b/lib/Sema/SemaLookup.cpp
@@ -3895,13 +3895,13 @@ TypoCorrection Sema::CorrectTypo(const DeclarationNameInfo &TypoName,
       // If a validator callback object was given, drop the correction
       // unless it passes validation.
       bool Viable = false;
-      for (TypoResultList::iterator RI = I->second.begin(), RIEnd = I->second.end();
-           RI != RIEnd; /* Increment in loop. */) {
+      for (TypoResultList::iterator RI = I->second.begin();
+           RI != I->second.end(); /* Increment in loop. */) {
         TypoResultList::iterator Prev = RI;
         ++RI;
         if (Prev->isResolved()) {
           if (!isCandidateViable(CCC, *Prev))
-            I->second.erase(Prev);
+            RI = I->second.erase(Prev);
           else
             Viable = true;
         }
diff --git a/test/SemaCXX/pr13394-crash-on-invalid.cpp b/test/SemaCXX/pr13394-crash-on-invalid.cpp
new file mode 100644
index 0000000000..413c52af85
--- /dev/null
+++ b/test/SemaCXX/pr13394-crash-on-invalid.cpp
@@ -0,0 +1,16 @@
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s
+// Don't crash (PR13394).
+
+namespace stretch_v1 {
+  struct closure_t {
+    const stretch_v1::ops_t* d_methods; // expected-error {{no type named 'ops_t' in namespace 'stretch_v1'}}
+  };
+}
+namespace gatekeeper_v1 {
+  namespace gatekeeper_factory_v1 {
+    struct closure_t { // expected-note {{'closure_t' declared here}}
+      gatekeeper_v1::closure_t* create(); // expected-error {{no type named 'closure_t' in namespace 'gatekeeper_v1'; did you mean 'closure_t'?}}
+    };
+  }
+  gatekeeper_v1::closure_t *x; // expected-error {{no type named 'closure_t' in namespace 'gatekeeper_v1}}
+}