Skip to content

Commit 8b13a42

Browse files
yoffyoff
committed
Python: Address review comments
1 parent 6d23d7f commit 8b13a42

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎python/ql/test/experimental/dataflow/regression/pointsto.expected‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
| test.py:16:9:16:14 | ControlFlowNode for source | test.py:9:1:9:13 | ControlFlowNode for FunctionExpr |
2-
| test.py:21:5:21:8 | ControlFlowNode for sink | test.py:12:1:12:14 | ControlFlowNode for FunctionExpr |
3-
| test.py:24:9:24:14 | ControlFlowNode for source | test.py:9:1:9:13 | ControlFlowNode for FunctionExpr |
4-
| test.py:25:5:25:8 | ControlFlowNode for sink | test.py:12:1:12:14 | ControlFlowNode for FunctionExpr |
5-
| test.py:44:12:44:17 | ControlFlowNode for source | test.py:9:1:9:13 | ControlFlowNode for FunctionExpr |
6-
| test.py:47:5:47:8 | ControlFlowNode for sink | test.py:12:1:12:14 | ControlFlowNode for FunctionExpr |
7-
| test.py:51:9:51:12 | ControlFlowNode for sink | test.py:12:1:12:14 | ControlFlowNode for FunctionExpr |
8-
| test.py:54:9:54:15 | ControlFlowNode for source2 | test.py:43:1:43:17 | ControlFlowNode for FunctionExpr |
9-
| test.py:55:5:55:9 | ControlFlowNode for sink2 | test.py:46:1:46:15 | ControlFlowNode for FunctionExpr |
10-
| test.py:63:5:63:9 | ControlFlowNode for sink3 | test.py:49:1:49:21 | ControlFlowNode for FunctionExpr |
11-
| test.py:70:5:70:9 | ControlFlowNode for sink3 | test.py:49:1:49:21 | ControlFlowNode for FunctionExpr |
12-
| test.py:77:9:77:11 | ControlFlowNode for hub | test.py:72:1:72:13 | ControlFlowNode for FunctionExpr |
13-
| test.py:82:9:82:11 | ControlFlowNode for hub | test.py:72:1:72:13 | ControlFlowNode for FunctionExpr |
1+
| test.py:9:1:9:13 | ControlFlowNode for FunctionExpr | test.py:16:9:16:14 | ControlFlowNode for source |
2+
| test.py:9:1:9:13 | ControlFlowNode for FunctionExpr | test.py:24:9:24:14 | ControlFlowNode for source |
3+
| test.py:9:1:9:13 | ControlFlowNode for FunctionExpr | test.py:44:12:44:17 | ControlFlowNode for source |
4+
| test.py:12:1:12:14 | ControlFlowNode for FunctionExpr | test.py:21:5:21:8 | ControlFlowNode for sink |
5+
| test.py:12:1:12:14 | ControlFlowNode for FunctionExpr | test.py:25:5:25:8 | ControlFlowNode for sink |
6+
| test.py:12:1:12:14 | ControlFlowNode for FunctionExpr | test.py:47:5:47:8 | ControlFlowNode for sink |
7+
| test.py:12:1:12:14 | ControlFlowNode for FunctionExpr | test.py:51:9:51:12 | ControlFlowNode for sink |
8+
| test.py:43:1:43:17 | ControlFlowNode for FunctionExpr | test.py:54:9:54:15 | ControlFlowNode for source2 |
9+
| test.py:46:1:46:15 | ControlFlowNode for FunctionExpr | test.py:55:5:55:9 | ControlFlowNode for sink2 |
10+
| test.py:49:1:49:21 | ControlFlowNode for FunctionExpr | test.py:63:5:63:9 | ControlFlowNode for sink3 |
11+
| test.py:49:1:49:21 | ControlFlowNode for FunctionExpr | test.py:70:5:70:9 | ControlFlowNode for sink3 |
12+
| test.py:72:1:72:13 | ControlFlowNode for FunctionExpr | test.py:77:9:77:11 | ControlFlowNode for hub |
13+
| test.py:72:1:72:13 | ControlFlowNode for FunctionExpr | test.py:82:9:82:11 | ControlFlowNode for hub |

‎python/ql/test/experimental/dataflow/regression/pointsto.ql‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
private import python
22
import experimental.dataflow.DataFlow
33

4-
predicate pointsToOrigin(DataFlow::DataFlowCfgNode pointer, DataFlow::DataFlowCfgNode pointed) {
5-
pointed = pointer.pointsTo().getOrigin()
4+
predicate pointsToOrigin(DataFlow::DataFlowCfgNode pointer, DataFlow::DataFlowCfgNode origin) {
5+
origin = pointer.pointsTo().getOrigin()
66
}
77

88
class PointsToConfiguration extends DataFlow::Configuration {
@@ -13,16 +13,16 @@ class PointsToConfiguration extends DataFlow::Configuration {
1313
override predicate isSink(DataFlow::Node node) { pointsToOrigin(node.asCfgNode(), _) }
1414
}
1515

16-
predicate hasFlow(ControlFlowNode pointed, ControlFlowNode pointer) {
16+
predicate hasFlow(ControlFlowNode origin, ControlFlowNode pointer) {
1717
exists(PointsToConfiguration config, DataFlow::PathNode source, DataFlow::PathNode sink |
18-
source.getNode().asCfgNode() = pointed and
18+
source.getNode().asCfgNode() = origin and
1919
sink.getNode().asCfgNode() = pointer and
2020
config.hasFlowPath(source, sink)
2121
)
2222
}
2323

24-
from DataFlow::DataFlowCfgNode pointer, DataFlow::DataFlowCfgNode pointed
24+
from DataFlow::DataFlowCfgNode pointer, DataFlow::DataFlowCfgNode origin
2525
where
26-
pointsToOrigin(pointer, pointed) and
27-
not hasFlow(pointed, pointer)
28-
select pointer, pointed
26+
pointsToOrigin(pointer, origin) and
27+
not hasFlow(origin, pointer)
28+
select origin, pointer

0 commit comments

Comments
 (0)