Skip to content

Commit 2e5fc19

Browse files
michaelnebelmichaelnebel
committed
C#: Update expected test output.
1 parent 3c6f538 commit 2e5fc19

File tree

5 files changed

+44
-27
lines changed

5 files changed

+44
-27
lines changed

‎csharp/ql/test/library-tests/dataflow/global/DataFlow.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
| GlobalDataFlow.cs:486:32:486:32 | access to parameter s |
5656
| GlobalDataFlow.cs:508:15:508:22 | access to field field |
5757
| GlobalDataFlow.cs:514:15:514:22 | access to field field |
58+
| GlobalDataFlow.cs:523:15:523:21 | access to field field |
5859
| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x |
5960
| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x |
6061
| Splitting.cs:11:19:11:19 | access to local variable x |

‎csharp/ql/test/library-tests/dataflow/global/DataFlowPath.expected

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ edges
129129
| GlobalDataFlow.cs:81:22:81:93 | call to method First<String> : String | GlobalDataFlow.cs:82:15:82:20 | access to local variable sink13 |
130130
| GlobalDataFlow.cs:81:22:81:93 | call to method First<String> : String | GlobalDataFlow.cs:83:59:83:64 | access to local variable sink13 : String |
131131
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:81:22:81:85 | call to method SelectEven<String,String> [element] : String |
132-
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:520:71:520:71 | e [element] : String |
132+
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:529:71:529:71 | e [element] : String |
133133
| GlobalDataFlow.cs:81:57:81:65 | { ..., ... } [element] : String | GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String |
134134
| GlobalDataFlow.cs:81:59:81:63 | access to local variable sink3 : String | GlobalDataFlow.cs:81:57:81:65 | { ..., ... } [element] : String |
135135
| GlobalDataFlow.cs:81:79:81:79 | x : String | GlobalDataFlow.cs:81:84:81:84 | access to parameter x : String |
@@ -264,16 +264,19 @@ edges
264264
| GlobalDataFlow.cs:490:28:490:41 | "taint source" : String | GlobalDataFlow.cs:483:53:483:55 | arg : String |
265265
| GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:507:25:507:26 | [post] access to local variable x1 [field field] : String |
266266
| GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:513:36:513:37 | [post] access to local variable y2 [field field] : String |
267+
| GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String | GlobalDataFlow.cs:522:33:522:33 | [post] access to local variable x [field field] : String |
267268
| GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:500:9:500:10 | [post] access to parameter sc [field field] : String |
268269
| GlobalDataFlow.cs:507:25:507:26 | [post] access to local variable x1 [field field] : String | GlobalDataFlow.cs:508:15:508:16 | access to local variable x1 [field field] : String |
269270
| GlobalDataFlow.cs:508:15:508:16 | access to local variable x1 [field field] : String | GlobalDataFlow.cs:508:15:508:22 | access to field field |
270271
| GlobalDataFlow.cs:513:36:513:37 | [post] access to local variable y2 [field field] : String | GlobalDataFlow.cs:514:15:514:16 | access to local variable y2 [field field] : String |
271272
| GlobalDataFlow.cs:514:15:514:16 | access to local variable y2 [field field] : String | GlobalDataFlow.cs:514:15:514:22 | access to field field |
272-
| GlobalDataFlow.cs:520:71:520:71 | e [element] : String | GlobalDataFlow.cs:523:27:523:27 | access to parameter e [element] : String |
273-
| GlobalDataFlow.cs:523:22:523:22 | SSA def(x) : String | GlobalDataFlow.cs:525:46:525:46 | access to local variable x : String |
274-
| GlobalDataFlow.cs:523:27:523:27 | access to parameter e [element] : String | GlobalDataFlow.cs:523:22:523:22 | SSA def(x) : String |
275-
| GlobalDataFlow.cs:525:46:525:46 | access to local variable x : String | GlobalDataFlow.cs:81:79:81:79 | x : String |
276-
| GlobalDataFlow.cs:525:46:525:46 | access to local variable x : String | GlobalDataFlow.cs:525:44:525:47 | delegate call : String |
273+
| GlobalDataFlow.cs:522:33:522:33 | [post] access to local variable x [field field] : String | GlobalDataFlow.cs:523:15:523:15 | access to local variable x [field field] : String |
274+
| GlobalDataFlow.cs:523:15:523:15 | access to local variable x [field field] : String | GlobalDataFlow.cs:523:15:523:21 | access to field field |
275+
| GlobalDataFlow.cs:529:71:529:71 | e [element] : String | GlobalDataFlow.cs:532:27:532:27 | access to parameter e [element] : String |
276+
| GlobalDataFlow.cs:532:22:532:22 | SSA def(x) : String | GlobalDataFlow.cs:534:46:534:46 | access to local variable x : String |
277+
| GlobalDataFlow.cs:532:27:532:27 | access to parameter e [element] : String | GlobalDataFlow.cs:532:22:532:22 | SSA def(x) : String |
278+
| GlobalDataFlow.cs:534:46:534:46 | access to local variable x : String | GlobalDataFlow.cs:81:79:81:79 | x : String |
279+
| GlobalDataFlow.cs:534:46:534:46 | access to local variable x : String | GlobalDataFlow.cs:534:44:534:47 | delegate call : String |
277280
| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String |
278281
| Splitting.cs:3:28:3:34 | tainted : String | Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String |
279282
| Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String | Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x |
@@ -537,11 +540,14 @@ nodes
537540
| GlobalDataFlow.cs:513:36:513:37 | [post] access to local variable y2 [field field] : String | semmle.label | [post] access to local variable y2 [field field] : String |
538541
| GlobalDataFlow.cs:514:15:514:16 | access to local variable y2 [field field] : String | semmle.label | access to local variable y2 [field field] : String |
539542
| GlobalDataFlow.cs:514:15:514:22 | access to field field | semmle.label | access to field field |
540-
| GlobalDataFlow.cs:520:71:520:71 | e [element] : String | semmle.label | e [element] : String |
541-
| GlobalDataFlow.cs:523:22:523:22 | SSA def(x) : String | semmle.label | SSA def(x) : String |
542-
| GlobalDataFlow.cs:523:27:523:27 | access to parameter e [element] : String | semmle.label | access to parameter e [element] : String |
543-
| GlobalDataFlow.cs:525:44:525:47 | delegate call : String | semmle.label | delegate call : String |
544-
| GlobalDataFlow.cs:525:46:525:46 | access to local variable x : String | semmle.label | access to local variable x : String |
543+
| GlobalDataFlow.cs:522:33:522:33 | [post] access to local variable x [field field] : String | semmle.label | [post] access to local variable x [field field] : String |
544+
| GlobalDataFlow.cs:523:15:523:15 | access to local variable x [field field] : String | semmle.label | access to local variable x [field field] : String |
545+
| GlobalDataFlow.cs:523:15:523:21 | access to field field | semmle.label | access to field field |
546+
| GlobalDataFlow.cs:529:71:529:71 | e [element] : String | semmle.label | e [element] : String |
547+
| GlobalDataFlow.cs:532:22:532:22 | SSA def(x) : String | semmle.label | SSA def(x) : String |
548+
| GlobalDataFlow.cs:532:27:532:27 | access to parameter e [element] : String | semmle.label | access to parameter e [element] : String |
549+
| GlobalDataFlow.cs:534:44:534:47 | delegate call : String | semmle.label | delegate call : String |
550+
| GlobalDataFlow.cs:534:46:534:46 | access to local variable x : String | semmle.label | access to local variable x : String |
545551
| Splitting.cs:3:28:3:34 | tainted : String | semmle.label | tainted : String |
546552
| Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String | semmle.label | [b (line 3): false] call to method Return<String> : String |
547553
| Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> : String | semmle.label | [b (line 3): true] call to method Return<String> : String |
@@ -579,15 +585,15 @@ subpaths
579585
| GlobalDataFlow.cs:73:94:73:98 | access to local variable sink0 : String | GlobalDataFlow.cs:298:26:298:26 | x : String | GlobalDataFlow.cs:301:16:301:41 | ... ? ... : ... : String | GlobalDataFlow.cs:73:29:73:101 | call to method Invoke : String |
580586
| GlobalDataFlow.cs:76:19:76:23 | access to local variable sink1 : String | GlobalDataFlow.cs:304:32:304:32 | x : String | GlobalDataFlow.cs:306:9:306:13 | SSA def(y) : String | GlobalDataFlow.cs:76:30:76:34 | SSA def(sink2) : String |
581587
| GlobalDataFlow.cs:79:19:79:23 | access to local variable sink2 : String | GlobalDataFlow.cs:310:32:310:32 | x : String | GlobalDataFlow.cs:312:9:312:13 | SSA def(y) : String | GlobalDataFlow.cs:79:30:79:34 | SSA def(sink3) : String |
582-
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:520:71:520:71 | e [element] : String | GlobalDataFlow.cs:525:44:525:47 | delegate call : String | GlobalDataFlow.cs:81:22:81:85 | call to method SelectEven<String,String> [element] : String |
588+
| GlobalDataFlow.cs:81:23:81:65 | (...) ... [element] : String | GlobalDataFlow.cs:529:71:529:71 | e [element] : String | GlobalDataFlow.cs:534:44:534:47 | delegate call : String | GlobalDataFlow.cs:81:22:81:85 | call to method SelectEven<String,String> [element] : String |
583589
| GlobalDataFlow.cs:138:63:138:63 | access to parameter x : String | GlobalDataFlow.cs:387:46:387:46 | x : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String | GlobalDataFlow.cs:138:45:138:64 | call to method ApplyFunc<String,String> : String |
584590
| GlobalDataFlow.cs:139:29:139:33 | access to local variable sink3 : String | GlobalDataFlow.cs:138:40:138:40 | x : String | GlobalDataFlow.cs:138:45:138:64 | call to method ApplyFunc<String,String> : String | GlobalDataFlow.cs:139:21:139:34 | delegate call : String |
585591
| GlobalDataFlow.cs:147:39:147:43 | access to local variable sink4 : String | GlobalDataFlow.cs:387:46:387:46 | x : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String | GlobalDataFlow.cs:147:21:147:44 | call to method ApplyFunc<String,String> : String |
586592
| GlobalDataFlow.cs:300:37:300:37 | access to parameter x : String | GlobalDataFlow.cs:387:46:387:46 | x : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String | GlobalDataFlow.cs:300:17:300:38 | call to method ApplyFunc<T,T> : String |
587593
| GlobalDataFlow.cs:389:18:389:18 | access to parameter x : String | GlobalDataFlow.cs:298:26:298:26 | x : String | GlobalDataFlow.cs:301:16:301:41 | ... ? ... : ... : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String |
588594
| GlobalDataFlow.cs:389:18:389:18 | access to parameter x : String | GlobalDataFlow.cs:298:26:298:26 | x : String | GlobalDataFlow.cs:301:16:301:41 | ... ? ... : ... : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String |
589595
| GlobalDataFlow.cs:389:18:389:18 | access to parameter x : String | GlobalDataFlow.cs:300:27:300:28 | x0 : String | GlobalDataFlow.cs:300:33:300:34 | access to parameter x0 : String | GlobalDataFlow.cs:389:16:389:19 | delegate call : String |
590-
| GlobalDataFlow.cs:525:46:525:46 | access to local variable x : String | GlobalDataFlow.cs:81:79:81:79 | x : String | GlobalDataFlow.cs:81:84:81:84 | access to parameter x : String | GlobalDataFlow.cs:525:44:525:47 | delegate call : String |
596+
| GlobalDataFlow.cs:534:46:534:46 | access to local variable x : String | GlobalDataFlow.cs:81:79:81:79 | x : String | GlobalDataFlow.cs:81:84:81:84 | access to parameter x : String | GlobalDataFlow.cs:534:44:534:47 | delegate call : String |
591597
| Splitting.cs:8:24:8:30 | [b (line 3): false] access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> : String |
592598
| Splitting.cs:8:24:8:30 | [b (line 3): true] access to parameter tainted : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> : String |
593599
| Splitting.cs:20:29:20:29 | access to parameter s : String | Splitting.cs:16:26:16:26 | x : String | Splitting.cs:16:32:16:32 | access to parameter x : String | Splitting.cs:20:22:20:30 | call to method Return<String> : String |
@@ -602,6 +608,7 @@ subpaths
602608
| GlobalDataFlow.cs:19:15:19:29 | access to field SinkField0 | GlobalDataFlow.cs:18:27:18:40 | "taint source" : String | GlobalDataFlow.cs:19:15:19:29 | access to field SinkField0 | access to field SinkField0 |
603609
| GlobalDataFlow.cs:508:15:508:22 | access to field field | GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:508:15:508:22 | access to field field | access to field field |
604610
| GlobalDataFlow.cs:514:15:514:22 | access to field field | GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:514:15:514:22 | access to field field | access to field field |
611+
| GlobalDataFlow.cs:523:15:523:21 | access to field field | GlobalDataFlow.cs:500:20:500:33 | "taint source" : String | GlobalDataFlow.cs:523:15:523:21 | access to field field | access to field field |
605612
| Splitting.cs:41:19:41:19 | access to local variable s | Splitting.cs:39:21:39:34 | [b (line 37): true] "taint source" : String | Splitting.cs:41:19:41:19 | access to local variable s | access to local variable s |
606613
| Splitting.cs:50:19:50:19 | access to local variable s | Splitting.cs:48:36:48:49 | "taint source" : String | Splitting.cs:50:19:50:19 | access to local variable s | access to local variable s |
607614
| Splitting.cs:52:19:52:19 | access to local variable s | Splitting.cs:48:36:48:49 | "taint source" : String | Splitting.cs:52:19:52:19 | access to local variable s | access to local variable s |

‎csharp/ql/test/library-tests/dataflow/global/GetAnOutNode.expected

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@
163163
| GlobalDataFlow.cs:510:18:510:34 | object creation of type SimpleClass | normal | GlobalDataFlow.cs:510:18:510:34 | object creation of type SimpleClass |
164164
| GlobalDataFlow.cs:511:18:511:34 | object creation of type SimpleClass | normal | GlobalDataFlow.cs:511:18:511:34 | object creation of type SimpleClass |
165165
| GlobalDataFlow.cs:512:18:512:34 | object creation of type SimpleClass | normal | GlobalDataFlow.cs:512:18:512:34 | object creation of type SimpleClass |
166-
| GlobalDataFlow.cs:525:44:525:47 | delegate call | normal | GlobalDataFlow.cs:525:44:525:47 | delegate call |
166+
| GlobalDataFlow.cs:521:17:521:36 | object creation of type SubSimpleClass | normal | GlobalDataFlow.cs:521:17:521:36 | object creation of type SubSimpleClass |
167+
| GlobalDataFlow.cs:534:44:534:47 | delegate call | normal | GlobalDataFlow.cs:534:44:534:47 | delegate call |
167168
| Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> | normal | Splitting.cs:8:17:8:31 | [b (line 3): false] call to method Return<String> |
168169
| Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> | normal | Splitting.cs:8:17:8:31 | [b (line 3): true] call to method Return<String> |
169170
| Splitting.cs:20:22:20:30 | call to method Return<String> | normal | Splitting.cs:20:22:20:30 | call to method Return<String> |

‎csharp/ql/test/library-tests/dataflow/global/TaintTracking.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
| GlobalDataFlow.cs:486:32:486:32 | access to parameter s |
6363
| GlobalDataFlow.cs:508:15:508:22 | access to field field |
6464
| GlobalDataFlow.cs:514:15:514:22 | access to field field |
65+
| GlobalDataFlow.cs:523:15:523:21 | access to field field |
6566
| Splitting.cs:9:15:9:15 | [b (line 3): false] access to local variable x |
6667
| Splitting.cs:9:15:9:15 | [b (line 3): true] access to local variable x |
6768
| Splitting.cs:11:19:11:19 | access to local variable x |

0 commit comments

Comments
 (0)