clang import: reject address-only function and enumerator declarations

Author: Nussu06

lib/clangimport.cpp

@@ -1055,7 +1055,10 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         return nullptr;
     }
     if (nodeType == EnumConstantDecl) {
-        Token *nameToken = addtoken(tokenList, getSpelling());
+        const std::string name = getSpelling();
+        if (name.empty())
+            throw InternalError(nullptr, "invalid AST node: " + nodeType, InternalError::AST);
+        Token *nameToken = addtoken(tokenList, name);
         auto *scope = const_cast<Scope *>(nameToken->scope());
         scope->enumeratorList.emplace_back(nameToken->scope());
         Enumerator *e = &scope->enumeratorList.back();
@@ -1386,6 +1389,10 @@ Token * clangimport::AstNode::createTokensCall(TokenList &tokenList)
 
 void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
 {
+    // an address-only node has no name: addtoken("") adds nothing and would return a null back()
+    const std::string name = getSpelling();
+    if (name.empty())
+        throw InternalError(nullptr, "invalid AST node: " + nodeType, InternalError::AST);
     const bool prev = contains(mExtTokens, "prev");
     const bool hasBody = !children.empty() && children.back()->nodeType == CompoundStmt;
     const bool isStatic = contains(mExtTokens, "static");
@@ -1407,7 +1414,7 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
     if (mExtTokens.size() > 4 && mExtTokens[1] == "parent")
         addFullScopeNameTokens(tokenList, mData->getScope(mExtTokens[2]));
 
-    Token *nameToken = addtoken(tokenList, getSpelling() + getTemplateParameters());
+    Token *nameToken = addtoken(tokenList, name + getTemplateParameters());
     auto *nestedIn = const_cast<Scope *>(nameToken->scope());
 
     if (prev) {

test/testclangimport.cpp

@@ -1440,6 +1440,11 @@ class TestClangImport : public TestFixture {
         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("`-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");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-CXXConstructorDecl 0x1"), AST, "invalid AST node: CXXConstructorDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-CXXMethodDecl 0x1"), AST, "invalid AST node: CXXMethodDecl");
+        ASSERT_THROW_INTERNAL_EQUALS(parse("`-EnumConstantDecl 0x1"), AST, "invalid AST node: EnumConstantDecl");
     }
 };