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

Skip to content

Commit 6960a7b

Browse files
author
Benjamin Muskalla
committed
Remove extraneous last column
1 parent ef97215 commit 6960a7b

4 files changed

Lines changed: 52 additions & 56 deletions

File tree

‎java/ql/src/utils/model-generator/ModelGeneratorUtils.qll‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,17 @@ string asSummaryModel(Callable api, string input, string output, string kind) {
5656
result =
5757
asPartialModel(api) + input + ";" //
5858
+ output + ";" //
59-
+ kind + ";" //
59+
+ kind
6060
}
6161

6262
bindingset[input, kind]
6363
string asSinkModel(Callable api, string input, string kind) {
64-
result =
65-
asPartialModel(api) + input + ";" //
66-
+ kind + ";" //
64+
result = asPartialModel(api) + input + ";" + kind
6765
}
6866

6967
bindingset[output, kind]
7068
string asSourceModel(Callable api, string output, string kind) {
71-
result =
72-
asPartialModel(api) + output + ";" //
73-
+ kind + ";" //
69+
result = asPartialModel(api) + output + ";" + kind
7470
}
7571

7672
/**

‎java/ql/test/utils/model-generator/CaptureSinkModels.expected‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
| p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[-1];create-file; |
2-
| p;Sinks;true;copyFileToDirectory;(Path,Path,CopyOption[]);;Argument[1];create-file; |
3-
| p;Sinks;true;readUrl;(URL,Charset);;Argument[0];open-url; |
4-
| p;Sources;true;readUrl;(URL);;Argument[0];open-url; |
1+
| p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[-1];create-file |
2+
| p;Sinks;true;copyFileToDirectory;(Path,Path,CopyOption[]);;Argument[1];create-file |
3+
| p;Sinks;true;readUrl;(URL,Charset);;Argument[0];open-url |
4+
| p;Sources;true;readUrl;(URL);;Argument[0];open-url |

‎java/ql/test/utils/model-generator/CaptureSourceModels.expected‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
| p;Sources;true;consumeSource;(int,Consumer);;Parameter[1];remote; |
2-
| p;Sources;true;readUrl;(URL);;ReturnValue;remote; |
3-
| p;Sources;true;socketStream;();;ReturnValue;remote; |
1+
| p;Sources;true;consumeSource;(int,Consumer);;Parameter[1];remote |
2+
| p;Sources;true;readUrl;(URL);;ReturnValue;remote |
3+
| p;Sources;true;socketStream;();;ReturnValue;remote |

‎java/ql/test/utils/model-generator/CaptureSummaryModels.expected‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
| p;Factory;false;create;(String);;Argument[0];ReturnValue;taint; |
2-
| p;Factory;false;create;(String,int);;Argument[0];ReturnValue;taint; |
3-
| p;Factory;false;getValue;();;Argument[-1];ReturnValue;taint; |
4-
| p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;taint; |
5-
| p;FluentAPI;false;returnsThis;(String);;Argument[-1];ReturnValue;value; |
6-
| p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[-1];taint; |
7-
| p;ImmutablePojo;false;getValue;();;Argument[-1];ReturnValue;taint; |
8-
| p;ImmutablePojo;false;or;(String);;Argument[-1];ReturnValue;taint; |
9-
| p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;taint; |
10-
| p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;taint; |
11-
| p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;taint; |
12-
| p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[-1];taint; |
13-
| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[-1];taint; |
14-
| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[1];Argument[-1];taint; |
15-
| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[2];Argument[-1];taint; |
16-
| p;Joiner;false;add;(CharSequence);;Argument[-1];ReturnValue;value; |
17-
| p;Joiner;false;merge;(Joiner);;Argument[-1];ReturnValue;value; |
18-
| p;Joiner;false;setEmptyValue;(CharSequence);;Argument[-1];ReturnValue;value; |
19-
| p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];Argument[-1];taint; |
20-
| p;Joiner;false;toString;();;Argument[-1];ReturnValue;taint; |
21-
| p;MultipleImpls$Strat2;true;getValue;();;Argument[-1];ReturnValue;taint; |
22-
| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[-1];taint; |
23-
| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;taint; |
24-
| p;ParamFlow;true;addTo;(String,List);;Argument[0];Element of Argument[1];taint; |
25-
| p;ParamFlow;true;returnArrayElement;(String[]);;ArrayElement of Argument[0];ReturnValue;taint; |
26-
| p;ParamFlow;true;returnCollectionElement;(List);;Element of Argument[0];ReturnValue;taint; |
27-
| p;ParamFlow;true;returnIterableElement;(Iterable);;Element of Argument[0];ReturnValue;taint; |
28-
| p;ParamFlow;true;returnIteratorElement;(Iterator);;Element of Argument[0];ReturnValue;taint; |
29-
| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[0];ReturnValue;taint; |
30-
| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[1];ReturnValue;taint; |
31-
| p;ParamFlow;true;returnVarArgElement;(String[]);;ArrayElement of Argument[0];ReturnValue;taint; |
32-
| p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;taint; |
33-
| p;ParamFlow;true;writeChunked;(byte[],OutputStream);;Argument[0];Argument[1];taint; |
34-
| p;ParamFlow;true;writeChunked;(char[],OutputStream);;Argument[0];Argument[1];taint; |
35-
| p;Pojo;false;fillIn;(List);;Argument[-1];Element of Argument[0];taint; |
36-
| p;Pojo;false;getBoxedBytes;();;Argument[-1];ReturnValue;taint; |
37-
| p;Pojo;false;getBoxedChars;();;Argument[-1];ReturnValue;taint; |
38-
| p;Pojo;false;getByteArray;();;Argument[-1];ReturnValue;taint; |
39-
| p;Pojo;false;getCharArray;();;Argument[-1];ReturnValue;taint; |
40-
| p;Pojo;false;getValue;();;Argument[-1];ReturnValue;taint; |
41-
| p;Pojo;false;setValue;(String);;Argument[0];Argument[-1];taint; |
42-
| p;PrivateFlowViaPublicInterface;true;createAnSPI;(File);;Argument[0];ReturnValue;taint; |
1+
| p;Factory;false;create;(String);;Argument[0];ReturnValue;taint |
2+
| p;Factory;false;create;(String,int);;Argument[0];ReturnValue;taint |
3+
| p;Factory;false;getValue;();;Argument[-1];ReturnValue;taint |
4+
| p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;taint |
5+
| p;FluentAPI;false;returnsThis;(String);;Argument[-1];ReturnValue;value |
6+
| p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[-1];taint |
7+
| p;ImmutablePojo;false;getValue;();;Argument[-1];ReturnValue;taint |
8+
| p;ImmutablePojo;false;or;(String);;Argument[-1];ReturnValue;taint |
9+
| p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;taint |
10+
| p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;taint |
11+
| p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;taint |
12+
| p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[-1];taint |
13+
| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[-1];taint |
14+
| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[1];Argument[-1];taint |
15+
| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[2];Argument[-1];taint |
16+
| p;Joiner;false;add;(CharSequence);;Argument[-1];ReturnValue;value |
17+
| p;Joiner;false;merge;(Joiner);;Argument[-1];ReturnValue;value |
18+
| p;Joiner;false;setEmptyValue;(CharSequence);;Argument[-1];ReturnValue;value |
19+
| p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];Argument[-1];taint |
20+
| p;Joiner;false;toString;();;Argument[-1];ReturnValue;taint |
21+
| p;MultipleImpls$Strat2;true;getValue;();;Argument[-1];ReturnValue;taint |
22+
| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[-1];taint |
23+
| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;taint |
24+
| p;ParamFlow;true;addTo;(String,List);;Argument[0];Element of Argument[1];taint |
25+
| p;ParamFlow;true;returnArrayElement;(String[]);;ArrayElement of Argument[0];ReturnValue;taint |
26+
| p;ParamFlow;true;returnCollectionElement;(List);;Element of Argument[0];ReturnValue;taint |
27+
| p;ParamFlow;true;returnIterableElement;(Iterable);;Element of Argument[0];ReturnValue;taint |
28+
| p;ParamFlow;true;returnIteratorElement;(Iterator);;Element of Argument[0];ReturnValue;taint |
29+
| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[0];ReturnValue;taint |
30+
| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[1];ReturnValue;taint |
31+
| p;ParamFlow;true;returnVarArgElement;(String[]);;ArrayElement of Argument[0];ReturnValue;taint |
32+
| p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;taint |
33+
| p;ParamFlow;true;writeChunked;(byte[],OutputStream);;Argument[0];Argument[1];taint |
34+
| p;ParamFlow;true;writeChunked;(char[],OutputStream);;Argument[0];Argument[1];taint |
35+
| p;Pojo;false;fillIn;(List);;Argument[-1];Element of Argument[0];taint |
36+
| p;Pojo;false;getBoxedBytes;();;Argument[-1];ReturnValue;taint |
37+
| p;Pojo;false;getBoxedChars;();;Argument[-1];ReturnValue;taint |
38+
| p;Pojo;false;getByteArray;();;Argument[-1];ReturnValue;taint |
39+
| p;Pojo;false;getCharArray;();;Argument[-1];ReturnValue;taint |
40+
| p;Pojo;false;getValue;();;Argument[-1];ReturnValue;taint |
41+
| p;Pojo;false;setValue;(String);;Argument[0];Argument[-1];taint |
42+
| p;PrivateFlowViaPublicInterface;true;createAnSPI;(File);;Argument[0];ReturnValue;taint |

0 commit comments

Comments
 (0)