minor improvements

Fraunhofer-AISEC · Aug 14, 2024 · 50fdaed · 50fdaed
1 parent 0635d77
commit 50fdaed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cpg-analysis/src/main/kotlin/de/fraunhofer/aisec/cpg/analysis/MultiValueEvaluator.kt b/cpg-analysis/src/main/kotlin/de/fraunhofer/aisec/cpg/analysis/MultiValueEvaluator.kt
@@ -52,8 +52,8 @@ class MultiValueEvaluator : ValueEvaluator() {
 
     override fun evaluate(node: Any?): Any? {
         val result = evaluateInternal(node as? Node, 0)
-        return if (result is Collection<*> && result.all { r -> r is Number })
-            ConcreteNumberSet(result.map { r -> (r as Number).toLong() }.toMutableSet())
+        return if (result is Collection<*> && result.filterNotNull().all { r -> r is Number })
+            ConcreteNumberSet(result.mapNotNull { r -> (r as? Number)?.toLong() }.toMutableSet())
         else result
     }
 

diff --git a/cpg-analysis/src/test/kotlin/de/fraunhofer/aisec/cpg/testcases/ValueEvaluationTests.kt b/cpg-analysis/src/test/kotlin/de/fraunhofer/aisec/cpg/testcases/ValueEvaluationTests.kt
@@ -162,6 +162,7 @@ class ValueEvaluationTests {
                                 ref("a") assign literal(2, t("int"))
                                 call("println") { ref("a") }
 
+                                // c = 5 - 2
                                 declare {
                                     variable("c", t("int")) {
                                         literal(5, t("int")) - literal(2, t("int"))
@@ -186,6 +187,8 @@ class ValueEvaluationTests {
                                     }
                                 }
 
+                                // g = -c
+                                // g = -3
                                 declare { variable("g", t("int")) { -ref("c") } }
 
                                 call("println") {