[c2cpg|jimple2cpg] Fixed name for nested declarators (#4996)

This happened for parameter and variable declarations in parentheses.
joernio · Oct 10, 2024 · cf3834d · cf3834d
1 parent c69ecf5
commit cf3834d
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 15 deletions.
diff --git a/...li/frontends/c2cpg/src/main/scala/io/joern/c2cpg/astcreation/AstForFunctionsCreator.scala b/...li/frontends/c2cpg/src/main/scala/io/joern/c2cpg/astcreation/AstForFunctionsCreator.scala
@@ -290,15 +290,10 @@ trait AstForFunctionsCreator(implicit withSchemaValidation: ValidationMode) { th
   private def parameterNodeInfo(parameter: IASTNode, paramIndex: Int): CGlobal.ParameterInfo = {
     val (name, codeString, tpe, variadic) = parameter match {
       case p: CASTParameterDeclaration =>
-        (
-          ASTStringUtil.getSimpleName(p.getDeclarator.getName),
-          code(p),
-          cleanType(typeForDeclSpecifier(p.getDeclSpecifier)),
-          false
-        )
+        (shortName(p.getDeclarator), code(p), cleanType(typeForDeclSpecifier(p.getDeclSpecifier)), false)
       case p: CPPASTParameterDeclaration =>
         (
-          ASTStringUtil.getSimpleName(p.getDeclarator.getName),
+          shortName(p.getDeclarator),
           code(p),
           cleanType(typeForDeclSpecifier(p.getDeclSpecifier)),
           p.getDeclarator.declaresParameterPack()

diff --git a/...i/frontends/c2cpg/src/main/scala/io/joern/c2cpg/astcreation/AstForPrimitivesCreator.scala b/...i/frontends/c2cpg/src/main/scala/io/joern/c2cpg/astcreation/AstForPrimitivesCreator.scala
@@ -95,9 +95,11 @@ trait AstForPrimitivesCreator(implicit withSchemaValidation: ValidationMode) { t
   private def nameForIdentifier(ident: IASTNode): String = {
     ident match {
       case id: IASTIdExpression => ASTStringUtil.getSimpleName(id.getName)
-      case id: IASTName if ASTStringUtil.getSimpleName(id).isEmpty && id.getBinding != null => id.getBinding.getName
-      case id: IASTName if ASTStringUtil.getSimpleName(id).isEmpty => uniqueName("name", "", "")._1
-      case _                                                       => code(ident)
+      case id: IASTName =>
+        val name = ASTStringUtil.getSimpleName(id)
+        if (name.isEmpty) Try(id.resolveBinding().getName).getOrElse(uniqueName("name", "", "")._1)
+        else name
+      case _ => code(ident)
     }
   }
 

diff --git a/joern-cli/frontends/c2cpg/src/main/scala/io/joern/c2cpg/astcreation/AstForTypesCreator.scala b/joern-cli/frontends/c2cpg/src/main/scala/io/joern/c2cpg/astcreation/AstForTypesCreator.scala
@@ -64,7 +64,7 @@ trait AstForTypesCreator(implicit withSchemaValidation: ValidationMode) { this:
   }
 
   protected def astForDeclarator(declaration: IASTSimpleDeclaration, declarator: IASTDeclarator, index: Int): Ast = {
-    val name = ASTStringUtil.getSimpleName(declarator.getName)
+    val name = shortName(declarator)
     declaration match {
       case d if isTypeDef(d) && shortName(d.getDeclSpecifier).nonEmpty =>
         val filename = fileName(declaration)

diff --git a/joern-cli/frontends/c2cpg/src/main/scala/io/joern/c2cpg/astcreation/FullNameProvider.scala b/joern-cli/frontends/c2cpg/src/main/scala/io/joern/c2cpg/astcreation/FullNameProvider.scala
@@ -207,10 +207,12 @@ trait FullNameProvider { this: AstCreator =>
   }
 
   private def shortNameForIASTDeclarator(declarator: IASTDeclarator): String = {
-    if (ASTStringUtil.getSimpleName(declarator.getName).isEmpty && declarator.getNestedDeclarator != null) {
-      shortName(declarator.getNestedDeclarator)
-    } else {
-      ASTStringUtil.getSimpleName(declarator.getName)
+    Try(declarator.getName.resolveBinding().getName).getOrElse {
+      if (ASTStringUtil.getSimpleName(declarator.getName).isEmpty && declarator.getNestedDeclarator != null) {
+        shortName(declarator.getNestedDeclarator)
+      } else {
+        ASTStringUtil.getSimpleName(declarator.getName)
+      }
     }
   }
 

diff --git a/joern-cli/frontends/c2cpg/src/test/scala/io/joern/c2cpg/passes/ast/MethodTests.scala b/joern-cli/frontends/c2cpg/src/test/scala/io/joern/c2cpg/passes/ast/MethodTests.scala
@@ -300,6 +300,23 @@ class MethodTests extends C2CpgSuite {
     }
   }
 
+  "Name for method parameter in parentheses" should {
+    "be correct" in {
+      val cpg = code("""
+          |int foo(int * (a)) {
+          |  int (x) = a;
+          |  return 2 * *a;
+          |}
+          |""".stripMargin)
+      val List(paramA) = cpg.method("foo").parameter.l
+      paramA.code shouldBe "int * (a)"
+      paramA.typeFullName shouldBe "int*"
+      paramA.name shouldBe "a"
+      cpg.identifier.nameExact("x").size shouldBe 1
+      cpg.method("foo").local.nameExact("x").size shouldBe 1
+    }
+  }
+
   "Method name, signature and full name tests" should {
     "be correct for plain C method" in {
       val cpg = code(