Skip to content

Commit 3cb27dc

Browse files
authored
Merge pull request #795 from MarcMil/dev-marc
Fix summaries
2 parents 7576847 + b6e38d9 commit 3cb27dc

File tree

7 files changed

+66
-33
lines changed

7 files changed

+66
-33
lines changed

soot-infoflow-summaries/summariesManual/java.lang.Boolean.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,21 @@
5858
<flows>
5959
<flow isAlias="false" typeChecking="false">
6060
<from sourceSinkType="Parameter" ParameterIndex="0" />
61-
<to sourceSinkType="Return" AccessPath="[java.lang.Boolean: java.lang.Boolean value]"
62-
AccessPathTypes="[java.lang.Boolean]" />
61+
<to sourceSinkType="Return" AccessPath="[java.lang.Boolean: boolean value]"
62+
BaseType="java.lang.Boolean"
63+
AccessPathTypes="[boolean]"
64+
/>
6365
</flow>
6466
</flows>
6567
</method>
6668
<method id="java.lang.Boolean valueOf(java.lang.String)">
6769
<flows>
6870
<flow isAlias="false" typeChecking="false">
6971
<from sourceSinkType="Parameter" ParameterIndex="0" />
70-
<to sourceSinkType="Return" AccessPath="[java.lang.Boolean: java.lang.Boolean value]"
71-
AccessPathTypes="[java.lang.Boolean]" />
72+
<to sourceSinkType="Return" AccessPath="[java.lang.Boolean: boolean value]"
73+
BaseType="java.lang.Boolean"
74+
AccessPathTypes="[boolean]"
75+
/>
7276
</flow>
7377
</flows>
7478
</method>

soot-infoflow-summaries/summariesManual/java.lang.Byte.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,26 +121,32 @@
121121
<flows>
122122
<flow isAlias="false" typeChecking="false">
123123
<from sourceSinkType="Parameter" ParameterIndex="0" />
124-
<to sourceSinkType="Return" AccessPath="[java.lang.Byte: java.lang.Byte value]"
125-
AccessPathTypes="[java.lang.Byte]" />
124+
<to sourceSinkType="Return" AccessPath="[java.lang.Byte: byte value]"
125+
BaseType="java.lang.Byte"
126+
AccessPathTypes="[byte]"
127+
/>
126128
</flow>
127129
</flows>
128130
</method>
129131
<method id="java.lang.Byte valueOf(java.lang.String)">
130132
<flows>
131133
<flow isAlias="false" typeChecking="false">
132134
<from sourceSinkType="Parameter" ParameterIndex="0" />
133-
<to sourceSinkType="Return" AccessPath="[java.lang.Byte: java.lang.Byte value]"
134-
AccessPathTypes="[java.lang.Byte]" />
135+
<to sourceSinkType="Return" AccessPath="[java.lang.Byte: byte value]"
136+
BaseType="java.lang.Byte"
137+
AccessPathTypes="[byte]"
138+
/>
135139
</flow>
136140
</flows>
137141
</method>
138142
<method id="java.lang.Byte valueOf(java.lang.String,int)">
139143
<flows>
140144
<flow isAlias="false" typeChecking="false">
141145
<from sourceSinkType="Parameter" ParameterIndex="0" />
142-
<to sourceSinkType="Return" AccessPath="[java.lang.Byte: java.lang.Byte value]"
143-
AccessPathTypes="[java.lang.Byte]" />
146+
<to sourceSinkType="Return" AccessPath="[java.lang.Byte: byte value]"
147+
BaseType="java.lang.Byte"
148+
AccessPathTypes="[byte]"
149+
/>
144150
</flow>
145151
</flows>
146152
</method>

soot-infoflow-summaries/summariesManual/java.lang.Character.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,9 @@
221221
<flow isAlias="false" typeChecking="false">
222222
<from sourceSinkType="Parameter" ParameterIndex="0" />
223223
<to sourceSinkType="Return" AccessPath="[java.lang.Character: char value]"
224-
AccessPathTypes="[char]" />
224+
BaseType="java.lang.Character"
225+
AccessPathTypes="[char]"
226+
/>
225227
</flow>
226228
</flows>
227229
</method>

soot-infoflow-summaries/summariesManual/java.lang.Float.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,9 @@
137137
<flow isAlias="false" typeChecking="false">
138138
<from sourceSinkType="Parameter" ParameterIndex="0" />
139139
<to sourceSinkType="Return" AccessPath="[java.lang.Float: float value]"
140-
AccessPathTypes="[float]" />
140+
BaseType="java.lang.Float"
141+
AccessPathTypes="[float]"
142+
/>
141143
</flow>
142144
</flows>
143145
</method>
@@ -146,16 +148,17 @@
146148
<flow isAlias="false" typeChecking="false">
147149
<from sourceSinkType="Parameter" ParameterIndex="0" />
148150
<to sourceSinkType="Return" AccessPath="[java.lang.Float: float value]"
149-
AccessPathTypes="[float]" />
151+
BaseType="java.lang.Float"
152+
AccessPathTypes="[float]"
153+
/>
150154
</flow>
151155
</flows>
152156
</method>
153157
<method id="float parseFloat(java.lang.String)">
154158
<flows>
155159
<flow isAlias="false" typeChecking="false">
156160
<from sourceSinkType="Parameter" ParameterIndex="0" />
157-
<to sourceSinkType="Return" AccessPath="[java.lang.Float: float value]"
158-
AccessPathTypes="[float]" />
161+
<to sourceSinkType="Return" />
159162
</flow>
160163
</flows>
161164
</method>

soot-infoflow-summaries/summariesManual/java.lang.Integer.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,26 +185,32 @@
185185
<flows>
186186
<flow isAlias="false" typeChecking="false">
187187
<from sourceSinkType="Parameter" ParameterIndex="0" />
188-
<to sourceSinkType="Return" AccessPath="[java.lang.Integer: java.lang.Integer value]"
189-
AccessPathTypes="[java.lang.Integer]" />
188+
<to sourceSinkType="Return" AccessPath="[java.lang.Integer: int value]"
189+
BaseType="java.lang.Integer"
190+
AccessPathTypes="[int]"
191+
/>
190192
</flow>
191193
</flows>
192194
</method>
193195
<method id="java.lang.Integer valueOf(java.lang.String)">
194196
<flows>
195197
<flow isAlias="false" typeChecking="false">
196198
<from sourceSinkType="Parameter" ParameterIndex="0" />
197-
<to sourceSinkType="Return" AccessPath="[java.lang.Integer: java.lang.Integer value]"
198-
AccessPathTypes="[java.lang.Integer]" />
199+
<to sourceSinkType="Return" AccessPath="[java.lang.Integer: int value]"
200+
BaseType="java.lang.Integer"
201+
AccessPathTypes="[int]"
202+
/>
199203
</flow>
200204
</flows>
201205
</method>
202206
<method id="java.lang.Integer valueOf(java.lang.String,int)">
203207
<flows>
204208
<flow isAlias="false" typeChecking="false">
205209
<from sourceSinkType="Parameter" ParameterIndex="0" />
206-
<to sourceSinkType="Return" AccessPath="[java.lang.Integer: java.lang.Integer value]"
207-
AccessPathTypes="[java.lang.Integer]" />
210+
<to sourceSinkType="Return" AccessPath="[java.lang.Integer: int value]"
211+
BaseType="java.lang.Integer"
212+
AccessPathTypes="[int]"
213+
/>
208214
</flow>
209215
</flows>
210216
</method>

soot-infoflow-summaries/summariesManual/java.lang.Long.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,26 +188,32 @@
188188
<flows>
189189
<flow isAlias="false" typeChecking="false">
190190
<from sourceSinkType="Parameter" ParameterIndex="0" />
191-
<to sourceSinkType="Return" AccessPath="[java.lang.Long: java.lang.Long value]"
192-
AccessPathTypes="[java.lang.Long]" />
191+
<to sourceSinkType="Return" AccessPath="[java.lang.Long: long value]"
192+
BaseType="java.lang.Long"
193+
AccessPathTypes="[long]"
194+
/>
193195
</flow>
194196
</flows>
195197
</method>
196198
<method id="java.lang.Long valueOf(java.lang.String)">
197199
<flows>
198200
<flow isAlias="false" typeChecking="false">
199201
<from sourceSinkType="Parameter" ParameterIndex="0" />
200-
<to sourceSinkType="Return" AccessPath="[java.lang.Long: java.lang.Long value]"
201-
AccessPathTypes="[java.lang.Long]" />
202+
<to sourceSinkType="Return" AccessPath="[java.lang.Long: long value]"
203+
BaseType="java.lang.Long"
204+
AccessPathTypes="[long]"
205+
/>
202206
</flow>
203207
</flows>
204208
</method>
205209
<method id="java.lang.Long valueOf(java.lang.String,int)">
206210
<flows>
207211
<flow isAlias="false" typeChecking="false">
208212
<from sourceSinkType="Parameter" ParameterIndex="0" />
209-
<to sourceSinkType="Return" AccessPath="[java.lang.Long: java.lang.Long value]"
210-
AccessPathTypes="[java.lang.Long]" />
213+
<to sourceSinkType="Return" AccessPath="[java.lang.Long: long value]"
214+
BaseType="java.lang.Long"
215+
AccessPathTypes="[long]"
216+
/>
211217
</flow>
212218
</flows>
213219
</method>

soot-infoflow-summaries/summariesManual/java.lang.Short.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,26 +129,32 @@
129129
<flows>
130130
<flow isAlias="false" typeChecking="false">
131131
<from sourceSinkType="Parameter" ParameterIndex="0" />
132-
<to sourceSinkType="Return" AccessPath="[java.lang.Short: java.lang.Short value]"
133-
AccessPathTypes="[java.lang.Short]" />
132+
<to sourceSinkType="Return" AccessPath="[java.lang.Short: short value]"
133+
BaseType="java.lang.Short"
134+
AccessPathTypes="[short]"
135+
/>
134136
</flow>
135137
</flows>
136138
</method>
137139
<method id="java.lang.Short valueOf(java.lang.String)">
138140
<flows>
139141
<flow isAlias="false" typeChecking="false">
140142
<from sourceSinkType="Parameter" ParameterIndex="0" />
141-
<to sourceSinkType="Return" AccessPath="[java.lang.Short: java.lang.Short value]"
142-
AccessPathTypes="[java.lang.Short]" />
143+
<to sourceSinkType="Return" AccessPath="[java.lang.Short: short value]"
144+
BaseType="java.lang.Short"
145+
AccessPathTypes="[short]"
146+
/>
143147
</flow>
144148
</flows>
145149
</method>
146150
<method id="java.lang.Short valueOf(java.lang.String,int)">
147151
<flows>
148152
<flow isAlias="false" typeChecking="false">
149153
<from sourceSinkType="Parameter" ParameterIndex="0" />
150-
<to sourceSinkType="Return" AccessPath="[java.lang.Short: java.lang.Short value]"
151-
AccessPathTypes="[java.lang.Short]" />
154+
<to sourceSinkType="Return" AccessPath="[java.lang.Short: short value]"
155+
BaseType="java.lang.Short"
156+
AccessPathTypes="[short]"
157+
/>
152158
</flow>
153159
</flows>
154160
</method>

0 commit comments

Comments
 (0)