[c2cpg] Fix code string for locals from ICPPASTNamedTypeSpecifier (#5233

)
joernio · Jan 17, 2025 · fef49d1 · fef49d1
1 parent 3ce044f
commit fef49d1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/joern-cli/frontends/c2cpg/src/main/scala/io/joern/c2cpg/astcreation/AstCreatorHelper.scala b/joern-cli/frontends/c2cpg/src/main/scala/io/joern/c2cpg/astcreation/AstCreatorHelper.scala
@@ -329,7 +329,10 @@ trait AstCreatorHelper(implicit withSchemaValidation: ValidationMode) { this: As
   }
 
   private def typeForCPPAstNamedTypeSpecifier(s: ICPPASTNamedTypeSpecifier, stripKeywords: Boolean): String = {
-    val tpe = safeGetBinding(s).map(_.toString).getOrElse(s.getRawSignature)
+    val tpe = safeGetBinding(s) match {
+      case Some(binding) if stripKeywords => binding.toString
+      case _                              => s.getRawSignature
+    }
     cleanType(tpe, stripKeywords)
   }
 

diff --git a/joern-cli/frontends/c2cpg/src/test/scala/io/joern/c2cpg/querying/LocalQueryTests.scala b/joern-cli/frontends/c2cpg/src/test/scala/io/joern/c2cpg/querying/LocalQueryTests.scala
@@ -29,6 +29,25 @@ class LocalQueryTests extends C2CpgSuite {
   }
 
   "local query example 2" should {
+    "allow to query for the local" in {
+      val cpg = code(
+        """
+          |class Foo {
+          |  static Foo* foo() {
+          |    static Foo bar;
+          |    return &bar;
+          |  }
+          |}
+          |""".stripMargin,
+        "test.cpp"
+      )
+      val List(barLocal) = cpg.method.name("foo").local.nameExact("bar").l
+      barLocal.typeFullName shouldBe "Foo"
+      barLocal.code shouldBe "static Foo bar"
+    }
+  }
+
+  "local query example 3" should {
     val cpg = code("""
         | struct node {
         |   int value;