Skip to content

Commit 4ecfe97

Browse files
lcarteylcartey
committed
C#: Adjust line numbers in test case.
1 parent 3c07cae commit 4ecfe97

File tree

8 files changed

+760
-748
lines changed

8 files changed

+760
-748
lines changed

‎csharp/ql/test/library-tests/dataflow/global/Capture.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,18 @@ void M()
108108
};
109109
CaptureOut2NotCalled();
110110
Check(nonSink0);
111+
/*string sink40 = "";
112+
void CaptureOutMultipleLambdas()
113+
{
114+
RunAction(() => {
115+
sink40 = "taint source";
116+
});
117+
RunAction(() => {
118+
sink40 = "not tainted";
119+
});
120+
};
121+
CaptureOutMultipleLambdas();
122+
Check(sink40);*/
111123
}
112124

113125
void Through(string tainted)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
| Capture.cs:72:15:72:20 | access to local variable sink30 |
66
| Capture.cs:84:15:84:20 | access to local variable sink31 |
77
| Capture.cs:93:15:93:20 | access to local variable sink32 |
8-
| Capture.cs:121:15:121:20 | access to local variable sink33 |
9-
| Capture.cs:133:15:133:20 | access to local variable sink34 |
10-
| Capture.cs:142:15:142:20 | access to local variable sink35 |
11-
| Capture.cs:149:15:149:20 | access to local variable sink36 |
12-
| Capture.cs:157:15:157:20 | access to local variable sink37 |
13-
| Capture.cs:183:15:183:20 | access to local variable sink38 |
8+
| Capture.cs:133:15:133:20 | access to local variable sink33 |
9+
| Capture.cs:145:15:145:20 | access to local variable sink34 |
10+
| Capture.cs:154:15:154:20 | access to local variable sink35 |
11+
| Capture.cs:161:15:161:20 | access to local variable sink36 |
12+
| Capture.cs:169:15:169:20 | access to local variable sink37 |
13+
| Capture.cs:195:15:195:20 | access to local variable sink38 |
1414
| GlobalDataFlow.cs:18:15:18:29 | access to field SinkField0 |
1515
| GlobalDataFlow.cs:26:15:26:32 | access to property SinkProperty0 |
1616
| GlobalDataFlow.cs:44:50:44:59 | access to parameter sinkParam2 |

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

Lines changed: 313 additions & 313 deletions
Large diffs are not rendered by default.

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@ edges
2222
| Capture.cs:89:13:89:35 | SSA def(sink32) | Capture.cs:92:9:92:41 | SSA call def(sink32) |
2323
| Capture.cs:89:22:89:35 | "taint source" | Capture.cs:89:13:89:35 | SSA def(sink32) |
2424
| Capture.cs:92:9:92:41 | SSA call def(sink32) | Capture.cs:93:15:93:20 | access to local variable sink32 |
25-
| Capture.cs:113:25:113:31 | tainted | Capture.cs:120:9:120:25 | [implicit argument] tainted |
26-
| Capture.cs:113:25:113:31 | tainted | Capture.cs:132:9:132:25 | [implicit argument] tainted |
27-
| Capture.cs:113:25:113:31 | tainted | Capture.cs:141:9:141:45 | [implicit argument] tainted |
28-
| Capture.cs:113:25:113:31 | tainted | Capture.cs:148:22:148:38 | [implicit argument] tainted |
29-
| Capture.cs:113:25:113:31 | tainted | Capture.cs:156:25:156:31 | access to parameter tainted |
30-
| Capture.cs:113:25:113:31 | tainted | Capture.cs:182:25:182:31 | access to parameter tainted |
31-
| Capture.cs:120:9:120:25 | SSA call def(sink33) | Capture.cs:121:15:121:20 | access to local variable sink33 |
32-
| Capture.cs:120:9:120:25 | [implicit argument] tainted | Capture.cs:120:9:120:25 | SSA call def(sink33) |
33-
| Capture.cs:132:9:132:25 | SSA call def(sink34) | Capture.cs:133:15:133:20 | access to local variable sink34 |
34-
| Capture.cs:132:9:132:25 | [implicit argument] tainted | Capture.cs:132:9:132:25 | SSA call def(sink34) |
35-
| Capture.cs:141:9:141:45 | SSA call def(sink35) | Capture.cs:142:15:142:20 | access to local variable sink35 |
36-
| Capture.cs:141:9:141:45 | [implicit argument] tainted | Capture.cs:141:9:141:45 | SSA call def(sink35) |
37-
| Capture.cs:148:22:148:38 | [implicit argument] tainted | Capture.cs:148:22:148:38 | call to local function CaptureThrough4 |
38-
| Capture.cs:148:22:148:38 | call to local function CaptureThrough4 | Capture.cs:149:15:149:20 | access to local variable sink36 |
39-
| Capture.cs:156:9:156:32 | SSA call def(sink37) | Capture.cs:157:15:157:20 | access to local variable sink37 |
40-
| Capture.cs:156:25:156:31 | access to parameter tainted | Capture.cs:156:9:156:32 | SSA call def(sink37) |
41-
| Capture.cs:182:22:182:32 | call to local function Id | Capture.cs:183:15:183:20 | access to local variable sink38 |
42-
| Capture.cs:182:25:182:31 | access to parameter tainted | Capture.cs:182:22:182:32 | call to local function Id |
25+
| Capture.cs:125:25:125:31 | tainted | Capture.cs:132:9:132:25 | [implicit argument] tainted |
26+
| Capture.cs:125:25:125:31 | tainted | Capture.cs:144:9:144:25 | [implicit argument] tainted |
27+
| Capture.cs:125:25:125:31 | tainted | Capture.cs:153:9:153:45 | [implicit argument] tainted |
28+
| Capture.cs:125:25:125:31 | tainted | Capture.cs:160:22:160:38 | [implicit argument] tainted |
29+
| Capture.cs:125:25:125:31 | tainted | Capture.cs:168:25:168:31 | access to parameter tainted |
30+
| Capture.cs:125:25:125:31 | tainted | Capture.cs:194:25:194:31 | access to parameter tainted |
31+
| Capture.cs:132:9:132:25 | SSA call def(sink33) | Capture.cs:133:15:133:20 | access to local variable sink33 |
32+
| Capture.cs:132:9:132:25 | [implicit argument] tainted | Capture.cs:132:9:132:25 | SSA call def(sink33) |
33+
| Capture.cs:144:9:144:25 | SSA call def(sink34) | Capture.cs:145:15:145:20 | access to local variable sink34 |
34+
| Capture.cs:144:9:144:25 | [implicit argument] tainted | Capture.cs:144:9:144:25 | SSA call def(sink34) |
35+
| Capture.cs:153:9:153:45 | SSA call def(sink35) | Capture.cs:154:15:154:20 | access to local variable sink35 |
36+
| Capture.cs:153:9:153:45 | [implicit argument] tainted | Capture.cs:153:9:153:45 | SSA call def(sink35) |
37+
| Capture.cs:160:22:160:38 | [implicit argument] tainted | Capture.cs:160:22:160:38 | call to local function CaptureThrough4 |
38+
| Capture.cs:160:22:160:38 | call to local function CaptureThrough4 | Capture.cs:161:15:161:20 | access to local variable sink36 |
39+
| Capture.cs:168:9:168:32 | SSA call def(sink37) | Capture.cs:169:15:169:20 | access to local variable sink37 |
40+
| Capture.cs:168:25:168:31 | access to parameter tainted | Capture.cs:168:9:168:32 | SSA call def(sink37) |
41+
| Capture.cs:194:22:194:32 | call to local function Id | Capture.cs:195:15:195:20 | access to local variable sink38 |
42+
| Capture.cs:194:25:194:31 | access to parameter tainted | Capture.cs:194:22:194:32 | call to local function Id |
4343
| GlobalDataFlow.cs:17:27:17:40 | "taint source" | GlobalDataFlow.cs:18:15:18:29 | access to field SinkField0 |
4444
| GlobalDataFlow.cs:17:27:17:40 | "taint source" | GlobalDataFlow.cs:26:15:26:32 | access to property SinkProperty0 |
4545
| GlobalDataFlow.cs:17:27:17:40 | "taint source" | GlobalDataFlow.cs:26:15:26:32 | access to property SinkProperty0 |
@@ -218,12 +218,12 @@ edges
218218
| Capture.cs:72:15:72:20 | access to local variable sink30 | Capture.cs:69:22:69:35 | "taint source" | Capture.cs:72:15:72:20 | access to local variable sink30 | access to local variable sink30 |
219219
| Capture.cs:84:15:84:20 | access to local variable sink31 | Capture.cs:79:26:79:39 | "taint source" | Capture.cs:84:15:84:20 | access to local variable sink31 | access to local variable sink31 |
220220
| Capture.cs:93:15:93:20 | access to local variable sink32 | Capture.cs:89:22:89:35 | "taint source" | Capture.cs:93:15:93:20 | access to local variable sink32 | access to local variable sink32 |
221-
| Capture.cs:121:15:121:20 | access to local variable sink33 | Capture.cs:113:25:113:31 | tainted | Capture.cs:121:15:121:20 | access to local variable sink33 | access to local variable sink33 |
222-
| Capture.cs:133:15:133:20 | access to local variable sink34 | Capture.cs:113:25:113:31 | tainted | Capture.cs:133:15:133:20 | access to local variable sink34 | access to local variable sink34 |
223-
| Capture.cs:142:15:142:20 | access to local variable sink35 | Capture.cs:113:25:113:31 | tainted | Capture.cs:142:15:142:20 | access to local variable sink35 | access to local variable sink35 |
224-
| Capture.cs:149:15:149:20 | access to local variable sink36 | Capture.cs:113:25:113:31 | tainted | Capture.cs:149:15:149:20 | access to local variable sink36 | access to local variable sink36 |
225-
| Capture.cs:157:15:157:20 | access to local variable sink37 | Capture.cs:113:25:113:31 | tainted | Capture.cs:157:15:157:20 | access to local variable sink37 | access to local variable sink37 |
226-
| Capture.cs:183:15:183:20 | access to local variable sink38 | Capture.cs:113:25:113:31 | tainted | Capture.cs:183:15:183:20 | access to local variable sink38 | access to local variable sink38 |
221+
| Capture.cs:133:15:133:20 | access to local variable sink33 | Capture.cs:125:25:125:31 | tainted | Capture.cs:133:15:133:20 | access to local variable sink33 | access to local variable sink33 |
222+
| Capture.cs:145:15:145:20 | access to local variable sink34 | Capture.cs:125:25:125:31 | tainted | Capture.cs:145:15:145:20 | access to local variable sink34 | access to local variable sink34 |
223+
| Capture.cs:154:15:154:20 | access to local variable sink35 | Capture.cs:125:25:125:31 | tainted | Capture.cs:154:15:154:20 | access to local variable sink35 | access to local variable sink35 |
224+
| Capture.cs:161:15:161:20 | access to local variable sink36 | Capture.cs:125:25:125:31 | tainted | Capture.cs:161:15:161:20 | access to local variable sink36 | access to local variable sink36 |
225+
| Capture.cs:169:15:169:20 | access to local variable sink37 | Capture.cs:125:25:125:31 | tainted | Capture.cs:169:15:169:20 | access to local variable sink37 | access to local variable sink37 |
226+
| Capture.cs:195:15:195:20 | access to local variable sink38 | Capture.cs:125:25:125:31 | tainted | Capture.cs:195:15:195:20 | access to local variable sink38 | access to local variable sink38 |
227227
| GlobalDataFlow.cs:136:15:136:19 | access to local variable sink4 | GlobalDataFlow.cs:17:27:17:40 | "taint source" | GlobalDataFlow.cs:136:15:136:19 | access to local variable sink4 | access to local variable sink4 |
228228
| GlobalDataFlow.cs:144:15:144:19 | access to local variable sink5 | GlobalDataFlow.cs:17:27:17:40 | "taint source" | GlobalDataFlow.cs:144:15:144:19 | access to local variable sink5 | access to local variable sink5 |
229229
| GlobalDataFlow.cs:154:15:154:19 | access to local variable sink6 | GlobalDataFlow.cs:318:16:318:29 | "taint source" | GlobalDataFlow.cs:154:15:154:19 | access to local variable sink6 | access to local variable sink6 |

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
| Capture.cs:92:9:92:51 | call to method ToArray | return | Capture.cs:92:9:92:51 | call to method ToArray |
1212
| Capture.cs:92:30:92:40 | [implicit call] access to local variable captureOut3 | captured sink32 | Capture.cs:92:9:92:41 | SSA call def(sink32) |
1313
| Capture.cs:92:30:92:40 | [implicit call] access to local variable captureOut3 | return | Capture.cs:92:30:92:40 | [output] access to local variable captureOut3 |
14-
| Capture.cs:120:9:120:25 | call to local function CaptureThrough1 | captured sink33 | Capture.cs:120:9:120:25 | SSA call def(sink33) |
15-
| Capture.cs:132:9:132:25 | [transitive] call to local function CaptureThrough2 | captured sink34 | Capture.cs:132:9:132:25 | SSA call def(sink34) |
16-
| Capture.cs:132:9:132:25 | call to local function CaptureThrough2 | captured sink34 | Capture.cs:132:9:132:25 | SSA call def(sink34) |
17-
| Capture.cs:141:9:141:45 | call to method Select | captured sink35 | Capture.cs:141:9:141:45 | SSA call def(sink35) |
18-
| Capture.cs:141:9:141:45 | call to method Select | return | Capture.cs:141:9:141:45 | call to method Select |
19-
| Capture.cs:141:9:141:45 | call to method Select | yield return | Capture.cs:141:9:141:45 | call to method Select |
20-
| Capture.cs:141:9:141:55 | call to method ToArray | return | Capture.cs:141:9:141:55 | call to method ToArray |
21-
| Capture.cs:141:30:141:44 | [implicit call] access to local variable captureThrough3 | captured sink35 | Capture.cs:141:9:141:45 | SSA call def(sink35) |
22-
| Capture.cs:141:30:141:44 | [implicit call] access to local variable captureThrough3 | return | Capture.cs:141:30:141:44 | [output] access to local variable captureThrough3 |
23-
| Capture.cs:148:22:148:38 | call to local function CaptureThrough4 | return | Capture.cs:148:22:148:38 | call to local function CaptureThrough4 |
24-
| Capture.cs:156:9:156:32 | call to local function CaptureThrough5 | captured sink37 | Capture.cs:156:9:156:32 | SSA call def(sink37) |
25-
| Capture.cs:179:20:179:22 | call to local function M | return | Capture.cs:179:20:179:22 | call to local function M |
26-
| Capture.cs:182:22:182:32 | call to local function Id | return | Capture.cs:182:22:182:32 | call to local function Id |
27-
| Capture.cs:184:20:184:25 | call to local function Id | return | Capture.cs:184:20:184:25 | call to local function Id |
14+
| Capture.cs:132:9:132:25 | call to local function CaptureThrough1 | captured sink33 | Capture.cs:132:9:132:25 | SSA call def(sink33) |
15+
| Capture.cs:144:9:144:25 | [transitive] call to local function CaptureThrough2 | captured sink34 | Capture.cs:144:9:144:25 | SSA call def(sink34) |
16+
| Capture.cs:144:9:144:25 | call to local function CaptureThrough2 | captured sink34 | Capture.cs:144:9:144:25 | SSA call def(sink34) |
17+
| Capture.cs:153:9:153:45 | call to method Select | captured sink35 | Capture.cs:153:9:153:45 | SSA call def(sink35) |
18+
| Capture.cs:153:9:153:45 | call to method Select | return | Capture.cs:153:9:153:45 | call to method Select |
19+
| Capture.cs:153:9:153:45 | call to method Select | yield return | Capture.cs:153:9:153:45 | call to method Select |
20+
| Capture.cs:153:9:153:55 | call to method ToArray | return | Capture.cs:153:9:153:55 | call to method ToArray |
21+
| Capture.cs:153:30:153:44 | [implicit call] access to local variable captureThrough3 | captured sink35 | Capture.cs:153:9:153:45 | SSA call def(sink35) |
22+
| Capture.cs:153:30:153:44 | [implicit call] access to local variable captureThrough3 | return | Capture.cs:153:30:153:44 | [output] access to local variable captureThrough3 |
23+
| Capture.cs:160:22:160:38 | call to local function CaptureThrough4 | return | Capture.cs:160:22:160:38 | call to local function CaptureThrough4 |
24+
| Capture.cs:168:9:168:32 | call to local function CaptureThrough5 | captured sink37 | Capture.cs:168:9:168:32 | SSA call def(sink37) |
25+
| Capture.cs:191:20:191:22 | call to local function M | return | Capture.cs:191:20:191:22 | call to local function M |
26+
| Capture.cs:194:22:194:32 | call to local function Id | return | Capture.cs:194:22:194:32 | call to local function Id |
27+
| Capture.cs:196:20:196:25 | call to local function Id | return | Capture.cs:196:20:196:25 | call to local function Id |
2828
| GlobalDataFlow.cs:25:9:25:26 | access to property SinkProperty0 | return | GlobalDataFlow.cs:25:9:25:26 | access to property SinkProperty0 |
2929
| GlobalDataFlow.cs:26:15:26:32 | access to property SinkProperty0 | return | GlobalDataFlow.cs:26:15:26:32 | access to property SinkProperty0 |
3030
| GlobalDataFlow.cs:29:9:29:29 | access to property NonSinkProperty0 | return | GlobalDataFlow.cs:29:9:29:29 | access to property NonSinkProperty0 |

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
| Capture.cs:72:15:72:20 | access to local variable sink30 |
66
| Capture.cs:84:15:84:20 | access to local variable sink31 |
77
| Capture.cs:93:15:93:20 | access to local variable sink32 |
8-
| Capture.cs:121:15:121:20 | access to local variable sink33 |
9-
| Capture.cs:133:15:133:20 | access to local variable sink34 |
10-
| Capture.cs:142:15:142:20 | access to local variable sink35 |
11-
| Capture.cs:149:15:149:20 | access to local variable sink36 |
12-
| Capture.cs:157:15:157:20 | access to local variable sink37 |
13-
| Capture.cs:183:15:183:20 | access to local variable sink38 |
8+
| Capture.cs:133:15:133:20 | access to local variable sink33 |
9+
| Capture.cs:145:15:145:20 | access to local variable sink34 |
10+
| Capture.cs:154:15:154:20 | access to local variable sink35 |
11+
| Capture.cs:161:15:161:20 | access to local variable sink36 |
12+
| Capture.cs:169:15:169:20 | access to local variable sink37 |
13+
| Capture.cs:195:15:195:20 | access to local variable sink38 |
1414
| GlobalDataFlow.cs:18:15:18:29 | access to field SinkField0 |
1515
| GlobalDataFlow.cs:26:15:26:32 | access to property SinkProperty0 |
1616
| GlobalDataFlow.cs:44:50:44:59 | access to parameter sinkParam2 |

0 commit comments

Comments
 (0)