Merge pull request #93 from joernio/michael/upgrade4

use latest odb/cpg
joernio · Jul 20, 2021 · 1b61734 · 1b61734
2 parents 9b2068e + 9ffcf68
commit 1b61734
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -3,7 +3,7 @@ ThisBuild/organization := "io.joern"
 ThisBuild/scalaVersion := "2.13.5" 
 // don't upgrade to 2.13.6 until https://github.com/com-lihaoyi/Ammonite/issues/1182 is resolved
 
-val cpgVersion = "1.3.212"
+val cpgVersion = "1.3.239"
 
 enablePlugins(JavaAppPackaging)
 enablePlugins(GitVersioning)

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.4
+sbt.version=1.5.5
diff --git a/src/main/scala/io/joern/scanners/c/CopyLoops.scala b/src/main/scala/io/joern/scanners/c/CopyLoops.scala
@@ -22,7 +22,7 @@ object CopyLoops extends QueryBundle {
         |""".stripMargin,
       score = 2,
       withStrRep({ cpg =>
-        cpg.assignment.target.isArrayAccess
+        cpg.assignment.target.arrayAccess
           .map { access =>
             (access.array, access.subscripts.code.toSet)
           }

diff --git a/src/main/scala/io/joern/scanners/c/FileOpRace.scala b/src/main/scala/io/joern/scanners/c/FileOpRace.scala
@@ -25,7 +25,7 @@ object FileOpRace extends QueryBundle {
         |""".stripMargin,
       score = 3.0,
       withStrRep({ cpg =>
-        val operations: Map[String, Seq[Integer]] = Map(
+        val operations: Map[String, Seq[Int]] = Map(
           "access" -> Seq(1),
           "chdir" -> Seq(1),
           "chmod" -> Seq(1),

diff --git a/src/main/scala/io/joern/scanners/c/NullTermination.scala b/src/main/scala/io/joern/scanners/c/NullTermination.scala
@@ -40,7 +40,7 @@ object NullTermination extends QueryBundle {
             case (method, dst, size) =>
               dst.reachableBy(allocations).codeExact(size.code).nonEmpty &&
                 method.assignments
-                  .where(_.target.isArrayAccess.code(s"${dst.code}.*\\[.*"))
+                  .where(_.target.arrayAccess.code(s"${dst.code}.*\\[.*"))
                   .source
                   .isLiteral
                   .code(".*0.*")

diff --git a/src/main/scala/io/joern/scanners/c/UseAfterFree.scala b/src/main/scala/io/joern/scanners/c/UseAfterFree.scala
@@ -198,7 +198,7 @@ object UseAfterFree extends QueryBundle {
           .where(_.argument(1).isIdentifier)
           .flatMap(f => {
             val freedIdentifierCode = f.argument(1).code
-            val postDom = f.postDominatedBy.toSet
+            val postDom = f.postDominatedBy.toSetImmutable
 
             val assignedPostDom = postDom.isIdentifier
               .where(_.inAssignment)