Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e1343c7

Browse files
yoffyoff
committed
Python: Support set literals.
1 parent ccff84d commit e1343c7

3 files changed

Lines changed: 41 additions & 5 deletions

File tree

‎python/ql/src/experimental/dataflow/internal/DataFlowPrivate.qll‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,8 @@ predicate jumpStep(Node pred, Node succ) {
283283
predicate storeStep(Node nodeFrom, Content c, Node nodeTo) {
284284
listStoreStep(nodeFrom, c, nodeTo)
285285
or
286+
setStoreStep(nodeFrom, c, nodeTo)
287+
or
286288
tupleStoreStep(nodeFrom, c, nodeTo)
287289
or
288290
dictStoreStep(nodeFrom, c, nodeTo)
@@ -295,17 +297,27 @@ predicate listStoreStep(CfgNode nodeFrom, ListElementContent c, CfgNode nodeTo)
295297
// List
296298
// `[..., 42, ...]`
297299
// nodeFrom is `42`, cfg node
298-
// nodeTo is the sequence, `[..., 42, ...]`, cfg node
300+
// nodeTo is the list, `[..., 42, ...]`, cfg node
299301
// c denotes element of list
300302
nodeTo.getNode().(ListNode).getAnElement() = nodeFrom.getNode()
301303
}
302304

305+
/** Data flows from an element of a set to the set. */
306+
predicate setStoreStep(CfgNode nodeFrom, ListElementContent c, CfgNode nodeTo) {
307+
// Set
308+
// `{..., 42, ...}`
309+
// nodeFrom is `42`, cfg node
310+
// nodeTo is the set, `{..., 42, ...}`, cfg node
311+
// c denotes element of list
312+
nodeTo.getNode().(SetNode).getAnElement() = nodeFrom.getNode()
313+
}
314+
303315
/** Data flows from an element of a tuple to the tuple at a specific index. */
304316
predicate tupleStoreStep(CfgNode nodeFrom, TupleElementContent c, CfgNode nodeTo) {
305317
// Tuple
306318
// `(..., 42, ...)`
307319
// nodeFrom is `42`, cfg node
308-
// nodeTo is the sequence, `(..., 42, ...)`, cfg node
320+
// nodeTo is the tuple, `(..., 42, ...)`, cfg node
309321
// c denotes element of tuple and index of nodeFrom
310322
exists(int n |
311323
nodeTo.getNode().(TupleNode).getElement(n) = nodeFrom.getNode() and
@@ -318,7 +330,7 @@ predicate dictStoreStep(CfgNode nodeFrom, DictionaryElementContent c, CfgNode no
318330
// Dictionary
319331
// `{..., "key" = 42, ...}`
320332
// nodeFrom is `42`, cfg node
321-
// nodeTo is the sequence, `{..., "key" = 42, ...}`, cfg node
333+
// nodeTo is the dict, `{..., "key" = 42, ...}`, cfg node
322334
// c denotes element of dictionary and the key `"key"`
323335
exists(KeyValuePair item |
324336
item = nodeTo.getNode().(DictNode).getNode().(Dict).getAnItem() and

‎python/ql/test/experimental/dataflow/coverage/dataflow.expected‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ edges
9797
| test.py:91:16:91:16 | SSA variable y | test.py:91:10:91:10 | ControlFlowNode for y |
9898
| test.py:91:21:91:21 | ControlFlowNode for l [List element] | test.py:91:16:91:16 | SSA variable y |
9999
| test.py:92:10:92:10 | ControlFlowNode for x [List element] | test.py:92:10:92:13 | ControlFlowNode for Subscript |
100+
| test.py:100:9:100:16 | ControlFlowNode for Set [List element] | test.py:101:10:101:10 | ControlFlowNode for x [List element] |
101+
| test.py:100:10:100:15 | ControlFlowNode for SOURCE | test.py:100:9:100:16 | ControlFlowNode for Set [List element] |
102+
| test.py:101:10:101:10 | ControlFlowNode for x [List element] | test.py:101:10:101:16 | ControlFlowNode for Attribute() |
100103
| test.py:104:9:104:37 | ControlFlowNode for SetComp [Set element] | test.py:105:10:105:10 | ControlFlowNode for x [Set element] |
101104
| test.py:104:10:104:15 | ControlFlowNode for SOURCE | test.py:104:9:104:37 | ControlFlowNode for SetComp [Set element] |
102105
| test.py:105:10:105:10 | ControlFlowNode for x [Set element] | test.py:105:10:105:16 | ControlFlowNode for Attribute() |
@@ -106,6 +109,13 @@ edges
106109
| test.py:108:21:108:28 | ControlFlowNode for List [List element] | test.py:108:16:108:16 | SSA variable y |
107110
| test.py:108:22:108:27 | ControlFlowNode for SOURCE | test.py:108:21:108:28 | ControlFlowNode for List [List element] |
108111
| test.py:109:10:109:10 | ControlFlowNode for x [Set element] | test.py:109:10:109:16 | ControlFlowNode for Attribute() |
112+
| test.py:112:9:112:16 | ControlFlowNode for Set [List element] | test.py:113:21:113:21 | ControlFlowNode for l [List element] |
113+
| test.py:112:10:112:15 | ControlFlowNode for SOURCE | test.py:112:9:112:16 | ControlFlowNode for Set [List element] |
114+
| test.py:113:9:113:22 | ControlFlowNode for SetComp [Set element] | test.py:114:10:114:10 | ControlFlowNode for x [Set element] |
115+
| test.py:113:10:113:10 | ControlFlowNode for y | test.py:113:9:113:22 | ControlFlowNode for SetComp [Set element] |
116+
| test.py:113:16:113:16 | SSA variable y | test.py:113:10:113:10 | ControlFlowNode for y |
117+
| test.py:113:21:113:21 | ControlFlowNode for l [List element] | test.py:113:16:113:16 | SSA variable y |
118+
| test.py:114:10:114:10 | ControlFlowNode for x [Set element] | test.py:114:10:114:16 | ControlFlowNode for Attribute() |
109119
| test.py:122:9:122:21 | ControlFlowNode for Dict [Dictionary element at key s] | test.py:123:10:123:10 | ControlFlowNode for x [Dictionary element at key s] |
110120
| test.py:122:15:122:20 | ControlFlowNode for SOURCE | test.py:122:9:122:21 | ControlFlowNode for Dict [Dictionary element at key s] |
111121
| test.py:123:10:123:10 | ControlFlowNode for x [Dictionary element at key s] | test.py:123:10:123:15 | ControlFlowNode for Subscript |
@@ -204,6 +214,10 @@ nodes
204214
| test.py:91:21:91:21 | ControlFlowNode for l [List element] | semmle.label | ControlFlowNode for l [List element] |
205215
| test.py:92:10:92:10 | ControlFlowNode for x [List element] | semmle.label | ControlFlowNode for x [List element] |
206216
| test.py:92:10:92:13 | ControlFlowNode for Subscript | semmle.label | ControlFlowNode for Subscript |
217+
| test.py:100:9:100:16 | ControlFlowNode for Set [List element] | semmle.label | ControlFlowNode for Set [List element] |
218+
| test.py:100:10:100:15 | ControlFlowNode for SOURCE | semmle.label | ControlFlowNode for SOURCE |
219+
| test.py:101:10:101:10 | ControlFlowNode for x [List element] | semmle.label | ControlFlowNode for x [List element] |
220+
| test.py:101:10:101:16 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
207221
| test.py:104:9:104:37 | ControlFlowNode for SetComp [Set element] | semmle.label | ControlFlowNode for SetComp [Set element] |
208222
| test.py:104:10:104:15 | ControlFlowNode for SOURCE | semmle.label | ControlFlowNode for SOURCE |
209223
| test.py:105:10:105:10 | ControlFlowNode for x [Set element] | semmle.label | ControlFlowNode for x [Set element] |
@@ -215,6 +229,14 @@ nodes
215229
| test.py:108:22:108:27 | ControlFlowNode for SOURCE | semmle.label | ControlFlowNode for SOURCE |
216230
| test.py:109:10:109:10 | ControlFlowNode for x [Set element] | semmle.label | ControlFlowNode for x [Set element] |
217231
| test.py:109:10:109:16 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
232+
| test.py:112:9:112:16 | ControlFlowNode for Set [List element] | semmle.label | ControlFlowNode for Set [List element] |
233+
| test.py:112:10:112:15 | ControlFlowNode for SOURCE | semmle.label | ControlFlowNode for SOURCE |
234+
| test.py:113:9:113:22 | ControlFlowNode for SetComp [Set element] | semmle.label | ControlFlowNode for SetComp [Set element] |
235+
| test.py:113:10:113:10 | ControlFlowNode for y | semmle.label | ControlFlowNode for y |
236+
| test.py:113:16:113:16 | SSA variable y | semmle.label | SSA variable y |
237+
| test.py:113:21:113:21 | ControlFlowNode for l [List element] | semmle.label | ControlFlowNode for l [List element] |
238+
| test.py:114:10:114:10 | ControlFlowNode for x [Set element] | semmle.label | ControlFlowNode for x [Set element] |
239+
| test.py:114:10:114:16 | ControlFlowNode for Attribute() | semmle.label | ControlFlowNode for Attribute() |
218240
| test.py:122:9:122:21 | ControlFlowNode for Dict [Dictionary element at key s] | semmle.label | ControlFlowNode for Dict [Dictionary element at key s] |
219241
| test.py:122:15:122:20 | ControlFlowNode for SOURCE | semmle.label | ControlFlowNode for SOURCE |
220242
| test.py:123:10:123:10 | ControlFlowNode for x [Dictionary element at key s] | semmle.label | ControlFlowNode for x [Dictionary element at key s] |
@@ -267,8 +289,10 @@ nodes
267289
| test.py:83:10:83:13 | ControlFlowNode for Subscript | test.py:82:10:82:15 | ControlFlowNode for SOURCE | test.py:83:10:83:13 | ControlFlowNode for Subscript | <message> |
268290
| test.py:87:10:87:13 | ControlFlowNode for Subscript | test.py:86:22:86:27 | ControlFlowNode for SOURCE | test.py:87:10:87:13 | ControlFlowNode for Subscript | <message> |
269291
| test.py:92:10:92:13 | ControlFlowNode for Subscript | test.py:90:10:90:15 | ControlFlowNode for SOURCE | test.py:92:10:92:13 | ControlFlowNode for Subscript | <message> |
292+
| test.py:101:10:101:16 | ControlFlowNode for Attribute() | test.py:100:10:100:15 | ControlFlowNode for SOURCE | test.py:101:10:101:16 | ControlFlowNode for Attribute() | <message> |
270293
| test.py:105:10:105:16 | ControlFlowNode for Attribute() | test.py:104:10:104:15 | ControlFlowNode for SOURCE | test.py:105:10:105:16 | ControlFlowNode for Attribute() | <message> |
271294
| test.py:109:10:109:16 | ControlFlowNode for Attribute() | test.py:108:22:108:27 | ControlFlowNode for SOURCE | test.py:109:10:109:16 | ControlFlowNode for Attribute() | <message> |
295+
| test.py:114:10:114:16 | ControlFlowNode for Attribute() | test.py:112:10:112:15 | ControlFlowNode for SOURCE | test.py:114:10:114:16 | ControlFlowNode for Attribute() | <message> |
272296
| test.py:123:10:123:15 | ControlFlowNode for Subscript | test.py:122:15:122:20 | ControlFlowNode for SOURCE | test.py:123:10:123:15 | ControlFlowNode for Subscript | <message> |
273297
| test.py:127:10:127:19 | ControlFlowNode for Attribute() | test.py:126:15:126:20 | ControlFlowNode for SOURCE | test.py:127:10:127:19 | ControlFlowNode for Attribute() | <message> |
274298
| test.py:252:10:252:21 | ControlFlowNode for Subscript | test.py:252:11:252:16 | ControlFlowNode for SOURCE | test.py:252:10:252:21 | ControlFlowNode for Subscript | <message> |

‎python/ql/test/experimental/dataflow/coverage/test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def test_nested_list_display():
9898
# 6.2.6. Set displays
9999
def test_set_display():
100100
x = {SOURCE}
101-
SINK(x.pop()) # Flow missing
101+
SINK(x.pop())
102102

103103
def test_set_comprehension():
104104
x = {SOURCE for y in [NONSOURCE]}
@@ -111,7 +111,7 @@ def test_set_comprehension_flow():
111111
def test_set_comprehension_inflow():
112112
l = {SOURCE}
113113
x = {y for y in l}
114-
SINK(x.pop()) # Flow missing
114+
SINK(x.pop())
115115

116116
def test_nested_set_display():
117117
x = {* {SOURCE}}

0 commit comments

Comments
 (0)