Fixed possible crash when parsing template declarations at the end of a C++ file.

src/shared/cplusplus/Parser.cpp

@@ -986,7 +986,7 @@ bool Parser::parseTemplateDeclaration(DeclarationAST *&node)
             match(T_GREATER, &ast->greater_token);
     }
 
-    do {
+    while (LA()) {
         unsigned start_declaration = cursor();
 
         ast->declaration = 0;
@@ -996,7 +996,7 @@ bool Parser::parseTemplateDeclaration(DeclarationAST *&node)
         _translationUnit->error(start_declaration, "expected a declaration");
         rewind(start_declaration + 1);
         skipUntilDeclaration();
-    } while (LA());
+    }
 
     node = ast;
     return true;
@@ -5825,3 +5825,11 @@ bool Parser::parseTrailingTypeSpecifierSeq(SpecifierListAST *&node)
     DEBUG_THIS_RULE();
     return parseSimpleTypeSpecifier(node);
 }
+
+void Parser::rewind(unsigned cursor)
+{
+    if (cursor < _translationUnit->tokenCount())
+        _tokenIndex = cursor;
+    else
+        _tokenIndex = _translationUnit->tokenCount() - 1;
+}

src/shared/cplusplus/Parser.h

@@ -310,8 +310,7 @@ public:
     inline unsigned cursor() const
     { return _tokenIndex; }
 
-    inline void rewind(unsigned cursor)
-    { _tokenIndex = cursor; }
+    void rewind(unsigned cursor);
 
     struct TemplateArgumentListEntry {
         unsigned index;