clang import: reject VarDecl/FieldDecl without a name token

Author: Nussu06

lib/clangimport.cpp

@@ -1569,14 +1569,15 @@ void clangimport::AstNode::createTokensForCXXRecord(TokenList &tokenList)
 
 Token * clangimport::AstNode::createTokensVarDecl(TokenList &tokenList)
 {
-    if (mExtTokens.size() < 2)
-        throw InternalError(nullptr, "invalid AST node: " + nodeType, InternalError::AST);
     const std::string addr = mExtTokens.front();
     if (contains(mExtTokens, "static"))
         addtoken(tokenList, "static");
     int typeIndex = mExtTokens.size() - 1;
     while (typeIndex > 1 && std::isalpha(mExtTokens[typeIndex][0]))
         typeIndex--;
+    // there must be a name token between the address and the type
+    if (typeIndex < 2)
+        throw InternalError(nullptr, "invalid AST node: " + nodeType, InternalError::AST);
     const std::string type = mExtTokens[typeIndex];
     const std::string name = mExtTokens[typeIndex - 1];
     const Token *startToken = tokenList.back();

test/testclangimport.cpp

@@ -1452,6 +1452,9 @@ class TestClangImport : public TestFixture {
                                            "      `-IntegerLiteral \n"), AST, "invalid AST node: IntegerLiteral");
         ASSERT_THROW_INTERNAL_EQUALS(parse("`-EnumDecl "), AST, "invalid AST node: EnumDecl");
         ASSERT_THROW_INTERNAL_EQUALS(parse("`-VarDecl 0x1"), AST, "invalid AST node: VarDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-VarDecl 0x1 'int'"), AST, "invalid AST node: VarDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-VarDecl 0x1 <col:1>"), AST, "invalid AST node: VarDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-FieldDecl 0x1 'int'"), AST, "invalid AST node: FieldDecl");
         ASSERT_THROW_INTERNAL_EQUALS(parse("`-FunctionDecl 0x1 <a.cpp:1:1, col:20> col:5 f 'int ()' prev"), AST, "invalid AST node: FunctionDecl");
         // address-only declarations: getSpelling() is empty, addtoken() adds nothing and back() is null
         ASSERT_THROW_INTERNAL_EQUALS(parse("`-FunctionDecl 0x1"), AST, "invalid AST node: FunctionDecl");