Merge pull request #98 from joernio/jcoetzee/fix-queries

Fix minor issues due to fuzzy and new c parser discrepancies
joernio · Aug 12, 2021 · bd5c73c · bd5c73c
2 parents b14b1a7 + 4543841
commit bd5c73c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/scala/io/joern/scanners/c/DangerousFunctions.scala b/src/main/scala/io/joern/scanners/c/DangerousFunctions.scala
@@ -318,7 +318,7 @@ object DangerousFunctions extends QueryBundle {
           |void secure_getcwd(char *buf, size_t len) {
           |    getcwd(buf, len);
           |}
-          |""")
+          |""".stripMargin)
       )
     )
 }
diff --git a/src/main/scala/io/joern/scanners/c/Metrics.scala b/src/main/scala/io/joern/scanners/c/Metrics.scala
@@ -167,7 +167,7 @@ object Metrics extends QueryBundle {
         cpg.method.internal
           .filter(
             _.ast.isControlStructure
-              .parserTypeName("(For|Do|While).*")
+              .controlStructureType("(FOR|DO|WHILE)")
               .size > n)
       }),
       tags = List(QueryTags.metrics),
@@ -230,7 +230,7 @@ object Metrics extends QueryBundle {
           |  }
           |}
           |
-          |""")
+          |""".stripMargin)
       )
     )
 }