hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-21 03:06:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Python: Address review comments

Browse Source
This commit is contained in:
Rasmus Lerchedahl Petersen
2020-09-01 14:00:41 +02:00
parent 6d23d7fa0e
commit 8b13a429b7
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
python/ql/test/experimental/dataflow/regression/pointsto.expected
View File

@@ -1,13 +1,13 @@
| test.py:16:9:16:14 | ControlFlowNode for source | test.py:9:1:9:13 | ControlFlowNode for FunctionExpr |
| test.py:21:5:21:8 | ControlFlowNode for sink | test.py:12:1:12:14 | ControlFlowNode for FunctionExpr |
| test.py:24:9:24:14 | ControlFlowNode for source | test.py:9:1:9:13 | ControlFlowNode for FunctionExpr |
| test.py:25:5:25:8 | ControlFlowNode for sink | test.py:12:1:12:14 | ControlFlowNode for FunctionExpr |
| test.py:44:12:44:17 | ControlFlowNode for source | test.py:9:1:9:13 | ControlFlowNode for FunctionExpr |
| test.py:47:5:47:8 | ControlFlowNode for sink | test.py:12:1:12:14 | ControlFlowNode for FunctionExpr |
| test.py:51:9:51:12 | ControlFlowNode for sink | test.py:12:1:12:14 | ControlFlowNode for FunctionExpr |
| test.py:54:9:54:15 | ControlFlowNode for source2 | test.py:43:1:43:17 | ControlFlowNode for FunctionExpr |
| test.py:55:5:55:9 | ControlFlowNode for sink2 | test.py:46:1:46:15 | ControlFlowNode for FunctionExpr |
| test.py:63:5:63:9 | ControlFlowNode for sink3 | test.py:49:1:49:21 | ControlFlowNode for FunctionExpr |
| test.py:70:5:70:9 | ControlFlowNode for sink3 | test.py:49:1:49:21 | ControlFlowNode for FunctionExpr |
| test.py:77:9:77:11 | ControlFlowNode for hub | test.py:72:1:72:13 | ControlFlowNode for FunctionExpr |
| test.py:82:9:82:11 | ControlFlowNode for hub | test.py:72:1:72:13 | ControlFlowNode for FunctionExpr |
| test.py:9:1:9:13 | ControlFlowNode for FunctionExpr | test.py:16:9:16:14 | ControlFlowNode for source |
| test.py:9:1:9:13 | ControlFlowNode for FunctionExpr | test.py:24:9:24:14 | ControlFlowNode for source |
| test.py:9:1:9:13 | ControlFlowNode for FunctionExpr | test.py:44:12:44:17 | ControlFlowNode for source |
| test.py:12:1:12:14 | ControlFlowNode for FunctionExpr | test.py:21:5:21:8 | ControlFlowNode for sink |
| test.py:12:1:12:14 | ControlFlowNode for FunctionExpr | test.py:25:5:25:8 | ControlFlowNode for sink |
| test.py:12:1:12:14 | ControlFlowNode for FunctionExpr | test.py:47:5:47:8 | ControlFlowNode for sink |
| test.py:12:1:12:14 | ControlFlowNode for FunctionExpr | test.py:51:9:51:12 | ControlFlowNode for sink |
| test.py:43:1:43:17 | ControlFlowNode for FunctionExpr | test.py:54:9:54:15 | ControlFlowNode for source2 |
| test.py:46:1:46:15 | ControlFlowNode for FunctionExpr | test.py:55:5:55:9 | ControlFlowNode for sink2 |
| test.py:49:1:49:21 | ControlFlowNode for FunctionExpr | test.py:63:5:63:9 | ControlFlowNode for sink3 |
| test.py:49:1:49:21 | ControlFlowNode for FunctionExpr | test.py:70:5:70:9 | ControlFlowNode for sink3 |
| test.py:72:1:72:13 | ControlFlowNode for FunctionExpr | test.py:77:9:77:11 | ControlFlowNode for hub |
| test.py:72:1:72:13 | ControlFlowNode for FunctionExpr | test.py:82:9:82:11 | ControlFlowNode for hub |

16
python/ql/test/experimental/dataflow/regression/pointsto.ql
View File

@@ -1,8 +1,8 @@
private import python
import experimental.dataflow.DataFlow
predicate pointsToOrigin(DataFlow::DataFlowCfgNode pointer, DataFlow::DataFlowCfgNode pointed) {
pointed = pointer.pointsTo().getOrigin()
predicate pointsToOrigin(DataFlow::DataFlowCfgNode pointer, DataFlow::DataFlowCfgNode origin) {
origin = pointer.pointsTo().getOrigin()
}
class PointsToConfiguration extends DataFlow::Configuration {
@@ -13,16 +13,16 @@ class PointsToConfiguration extends DataFlow::Configuration {
override predicate isSink(DataFlow::Node node) { pointsToOrigin(node.asCfgNode(), _) }
}
predicate hasFlow(ControlFlowNode pointed, ControlFlowNode pointer) {
predicate hasFlow(ControlFlowNode origin, ControlFlowNode pointer) {
exists(PointsToConfiguration config, DataFlow::PathNode source, DataFlow::PathNode sink |
source.getNode().asCfgNode() = pointed and
source.getNode().asCfgNode() = origin and
sink.getNode().asCfgNode() = pointer and
config.hasFlowPath(source, sink)
)
}
from DataFlow::DataFlowCfgNode pointer, DataFlow::DataFlowCfgNode pointed
from DataFlow::DataFlowCfgNode pointer, DataFlow::DataFlowCfgNode origin
where
pointsToOrigin(pointer, pointed) and
not hasFlow(pointed, pointer)
select pointer, pointed
pointsToOrigin(pointer, origin) and
not hasFlow(origin, pointer)
select origin, pointer