Shared: Fix propagation of call bit

github · Dec 17, 2024 · 8340841 · 8340841
1 parent 950ae44
commit 8340841
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/java/ql/test/library-tests/dataflow/deduplicate-path-graph/test.expected b/java/ql/test/library-tests/dataflow/deduplicate-path-graph/test.expected
@@ -14,16 +14,20 @@ nodes
 | A.java:19:33:19:37 | step1 : String | semmle.label | step1 : String |
 | A.java:21:10:21:14 | step2 | semmle.label | step2 |
 | A.java:26:8:26:8 | x : String | semmle.label | x : String |
+| A.java:26:8:26:8 | x : String | semmle.label | x : String |
+| A.java:26:13:26:81 | ...?...:... : String | semmle.label | ...?...:... : String |
 | A.java:26:13:26:81 | ...?...:... : String | semmle.label | ...?...:... : String |
 | A.java:26:35:26:56 | propagateState(...) : String | semmle.label | propagateState(...) : String |
 | A.java:26:50:26:50 | x : String | semmle.label | x : String |
 | A.java:26:60:26:81 | propagateState(...) : String | semmle.label | propagateState(...) : String |
 | A.java:26:75:26:75 | x : String | semmle.label | x : String |
 | A.java:28:20:28:27 | source(...) : String | semmle.label | source(...) : String |
 | A.java:29:20:29:38 | apply(...) : String | semmle.label | apply(...) : String |
+| A.java:29:20:29:38 | apply(...) : String | semmle.label | apply(...) : String |
 | A.java:29:33:29:37 | step0 : String | semmle.label | step0 : String |
 | A.java:30:20:30:38 | apply(...) : String | semmle.label | apply(...) : String |
 | A.java:30:33:30:37 | step1 : String | semmle.label | step1 : String |
+| A.java:30:33:30:37 | step1 : String | semmle.label | step1 : String |
 | A.java:32:10:32:14 | step2 | semmle.label | step2 |
 edges
 | A.java:14:9:14:9 | x : String | A.java:14:29:14:29 | x : String | provenance |  |
@@ -50,21 +54,26 @@ edges
 | A.java:26:75:26:75 | x : String | A.java:26:60:26:81 | propagateState(...) : String | provenance | Config |
 | A.java:28:20:28:27 | source(...) : String | A.java:29:33:29:37 | step0 : String | provenance |  |
 | A.java:29:20:29:38 | apply(...) : String | A.java:30:33:30:37 | step1 : String | provenance |  |
+| A.java:29:20:29:38 | apply(...) : String | A.java:30:33:30:37 | step1 : String | provenance |  |
+| A.java:29:33:29:37 | step0 : String | A.java:26:8:26:8 | x : String | provenance |  |
 | A.java:29:33:29:37 | step0 : String | A.java:26:8:26:8 | x : String | provenance |  |
 | A.java:29:33:29:37 | step0 : String | A.java:29:20:29:38 | apply(...) : String | provenance | Config |
+| A.java:29:33:29:37 | step0 : String | A.java:29:20:29:38 | apply(...) : String | provenance | Config |
 | A.java:30:20:30:38 | apply(...) : String | A.java:32:10:32:14 | step2 | provenance |  |
 | A.java:30:33:30:37 | step1 : String | A.java:26:8:26:8 | x : String | provenance |  |
+| A.java:30:33:30:37 | step1 : String | A.java:26:8:26:8 | x : String | provenance |  |
+| A.java:30:33:30:37 | step1 : String | A.java:30:20:30:38 | apply(...) : String | provenance | Config |
 | A.java:30:33:30:37 | step1 : String | A.java:30:20:30:38 | apply(...) : String | provenance | Config |
 subpaths
 | A.java:18:33:18:37 | step0 : String | A.java:14:9:14:9 | x : String | A.java:14:14:14:35 | propagateState(...) : String | A.java:18:20:18:38 | apply(...) : String |
 | A.java:18:33:18:37 | step0 : String | A.java:15:9:15:9 | x : String | A.java:15:14:15:35 | propagateState(...) : String | A.java:18:20:18:38 | apply(...) : String |
 | A.java:19:33:19:37 | step1 : String | A.java:14:9:14:9 | x : String | A.java:14:14:14:35 | propagateState(...) : String | A.java:19:20:19:38 | apply(...) : String |
 | A.java:19:33:19:37 | step1 : String | A.java:15:9:15:9 | x : String | A.java:15:14:15:35 | propagateState(...) : String | A.java:19:20:19:38 | apply(...) : String |
 | A.java:29:33:29:37 | step0 : String | A.java:26:8:26:8 | x : String | A.java:26:13:26:81 | ...?...:... : String | A.java:29:20:29:38 | apply(...) : String |
+| A.java:29:33:29:37 | step0 : String | A.java:26:8:26:8 | x : String | A.java:26:13:26:81 | ...?...:... : String | A.java:29:20:29:38 | apply(...) : String |
+| A.java:30:33:30:37 | step1 : String | A.java:26:8:26:8 | x : String | A.java:26:13:26:81 | ...?...:... : String | A.java:30:20:30:38 | apply(...) : String |
 | A.java:30:33:30:37 | step1 : String | A.java:26:8:26:8 | x : String | A.java:26:13:26:81 | ...?...:... : String | A.java:30:20:30:38 | apply(...) : String |
 spuriousFlow
-| A.java:26:35:26:56 | propagateState(...) : String | B | A |
-| A.java:26:60:26:81 | propagateState(...) : String | A | B |
 #select
 | A.java:17:20:17:27 | source(...) : String | A.java:17:20:17:27 | source(...) : String | A.java:21:10:21:14 | step2 | Flow |
 | A.java:28:20:28:27 | source(...) : String | A.java:28:20:28:27 | source(...) : String | A.java:32:10:32:14 | step2 | Flow |
diff --git a/shared/dataflow/codeql/dataflow/DataFlow.qll b/shared/dataflow/codeql/dataflow/DataFlow.qll
@@ -973,13 +973,13 @@ module DataFlowMake<LocationSig Location, InputSig<Location> Lang> {
           // Retain flow state if one of the successors requires it to be retained
           discriminatedPathNode(stepEx(getAPathNode(node, toString)), hasEnter)
           or
-          // Enter a subpath
-          discriminatedPathNode(enterSubpathStep(getAPathNode(node, toString)), _) and
-          hasEnter = true
-          or
-          // Exit a subpath
-          discriminatedPathNode(exitSubpathStep(getAPathNode(node, toString)), false) and
+          // Propagate backwards from parameter to argument
+          discriminatedPathNode(enterSubpathStep(getAPathNode(node, toString)), false) and
           hasEnter = false
+          or
+          // Propagate backwards from out to return
+          discriminatedPathNode(exitSubpathStep(getAPathNode(node, toString)), _) and
+          hasEnter = true
         )
       }