Merge pull request #1613 from jplag/bug/cpp-null-pointer

Fixed a bug, where the cpp listener could throw a null pointer exception
jplag · Feb 26, 2024 · cba2e06 · cba2e06
2 parents 85b3736 + 8ad5794
commit cba2e06
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/languages/cpp/src/main/java/de/jplag/cpp/CPPListener.java b/languages/cpp/src/main/java/de/jplag/cpp/CPPListener.java
@@ -207,7 +207,7 @@ private void declarationRules() {
 
         visit(ParameterDeclarationContext.class).map(VARDEF).withSemantics(CodeSemantics::new).onEnter((ctx, varReg) -> {
             // don't register parameters in function declarations, e.g. bc6h_enc lines 117-120
-            if (hasAncestor(ctx, FunctionDefinitionContext.class, SimpleDeclarationContext.class)) {
+            if (hasAncestor(ctx, FunctionDefinitionContext.class, SimpleDeclarationContext.class) && ctx.declarator() != null) {
                 CPP14Parser.PointerDeclaratorContext pd = ctx.declarator().pointerDeclarator();
                 String name = pd.noPointerDeclarator().getText();
                 varReg.registerVariable(name, VariableScope.LOCAL, true);