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

Skip to content

Commit 7f80871

Browse files
asgerfasgerf
committed
Java: update model generator
1 parent 753c557 commit 7f80871

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ string parameterAccess(Parameter p) {
162162
if
163163
p.getType() instanceof Array and
164164
not isPrimitiveTypeUsedForBulkData(p.getType().(Array).getElementType())
165-
then result = "ArrayElement of Argument[" + p.getPosition() + "]"
165+
then result = "Argument[" + p.getPosition() + "].ArrayElement"
166166
else
167167
if p.getType() instanceof ContainerType
168-
then result = "Element of Argument[" + p.getPosition() + "]"
168+
then result = "Argument[" + p.getPosition() + "].Element"
169169
else result = "Argument[" + p.getPosition() + "]"
170170
}
171171

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
| p;Sources;true;readUrl;(URL);;ReturnValue;remote |
22
| p;Sources;true;socketStream;();;ReturnValue;remote |
3-
| p;Sources;true;sourceToParameter;(InputStream[],List);;ArrayElement of Argument[0];remote |
4-
| p;Sources;true;sourceToParameter;(InputStream[],List);;Element of Argument[1];remote |
3+
| p;Sources;true;sourceToParameter;(InputStream[],List);;Argument[0].ArrayElement;remote |
4+
| p;Sources;true;sourceToParameter;(InputStream[],List);;Argument[1].Element;remote |

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@
2626
| p;MultipleImpls$Strat2;true;getValue;();;Argument[-1];ReturnValue;taint |
2727
| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[-1];taint |
2828
| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;taint |
29-
| p;ParamFlow;true;addTo;(String,List);;Argument[0];Element of Argument[1];taint |
30-
| p;ParamFlow;true;returnArrayElement;(String[]);;ArrayElement of Argument[0];ReturnValue;taint |
31-
| p;ParamFlow;true;returnCollectionElement;(List);;Element of Argument[0];ReturnValue;taint |
32-
| p;ParamFlow;true;returnIterableElement;(Iterable);;Element of Argument[0];ReturnValue;taint |
33-
| p;ParamFlow;true;returnIteratorElement;(Iterator);;Element of Argument[0];ReturnValue;taint |
29+
| p;ParamFlow;true;addTo;(String,List);;Argument[0];Argument[1].Element;taint |
30+
| p;ParamFlow;true;returnArrayElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint |
31+
| p;ParamFlow;true;returnCollectionElement;(List);;Argument[0].Element;ReturnValue;taint |
32+
| p;ParamFlow;true;returnIterableElement;(Iterable);;Argument[0].Element;ReturnValue;taint |
33+
| p;ParamFlow;true;returnIteratorElement;(Iterator);;Argument[0].Element;ReturnValue;taint |
3434
| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[0];ReturnValue;taint |
3535
| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[1];ReturnValue;taint |
36-
| p;ParamFlow;true;returnVarArgElement;(String[]);;ArrayElement of Argument[0];ReturnValue;taint |
36+
| p;ParamFlow;true;returnVarArgElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint |
3737
| p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;taint |
3838
| p;ParamFlow;true;writeChunked;(byte[],OutputStream);;Argument[0];Argument[1];taint |
3939
| p;ParamFlow;true;writeChunked;(char[],OutputStream);;Argument[0];Argument[1];taint |
40-
| p;Pojo;false;fillIn;(List);;Argument[-1];Element of Argument[0];taint |
40+
| p;Pojo;false;fillIn;(List);;Argument[-1];Argument[0].Element;taint |
4141
| p;Pojo;false;getBoxedBytes;();;Argument[-1];ReturnValue;taint |
4242
| p;Pojo;false;getBoxedChars;();;Argument[-1];ReturnValue;taint |
4343
| p;Pojo;false;getByteArray;();;Argument[-1];ReturnValue;taint |

0 commit comments

Comments
 (0)