Merge pull request #796 from MarcMil/dev-marc

Fix summaries for ObjectInputStream and Random

Author: StevenArzt

soot-infoflow-summaries/summariesManual/java.io.ObjectInputStream.xml

@@ -133,21 +133,21 @@
 		</method>
 		<method id="java.lang.Object readObject()">
 			<flows>
-				<flow isAlias="false" typeChecking="false" cutSubfields="true">
+				<flow isAlias="false" typeChecking="false" cutSubfields="true" ignoreTypes="true">
 					<from sourceSinkType="Field"
 						AccessPath="[java.io.InputStream: java.io.InputStream innerStream]"
 						AccessPathTypes="[java.io.InputStream]"/>
-					<to sourceSinkType="Return" />
+					<to sourceSinkType="Return" BaseType="java.lang.Object" />
 				</flow>
 			</flows>
 		</method>
 		<method id="java.lang.Object readObjectOverride()">
 			<flows>
-				<flow isAlias="false" typeChecking="false" cutSubfields="true">
+				<flow isAlias="false" typeChecking="false" cutSubfields="true" ignoreTypes="true">
 					<from sourceSinkType="Field" 
 						AccessPath="[java.io.InputStream: java.io.InputStream innerStream]"
 						AccessPathTypes="[java.io.InputStream]"/>
-					<to sourceSinkType="Return" />
+					<to sourceSinkType="Return" BaseType="java.lang.Object" />
 				</flow>
 			</flows>
 		</method>
@@ -163,11 +163,11 @@
 		</method>
 		<method id="java.lang.Object readUnshared()">
 			<flows>
-				<flow isAlias="false" typeChecking="false" cutSubfields="true">
+				<flow isAlias="false" typeChecking="false" cutSubfields="true" ignoreTypes="true">
 					<from sourceSinkType="Field" 
 						AccessPath="[java.io.InputStream: java.io.InputStream innerStream]"
 						AccessPathTypes="[java.io.InputStream]"/>
-					<to sourceSinkType="Return" />
+					<to sourceSinkType="Return" BaseType="java.lang.Object" />
 				</flow>
 			</flows>
 		</method>

soot-infoflow-summaries/summariesManual/java.util.Random.xml

@@ -9,5 +9,61 @@
 				</flow>
 			</flows>
 		</method>
+		<method id="int nextInt()">
+			<flows>
+				<flow isAlias="false" typeChecking="false">
+					<from sourceSinkType="Field" />
+					<to sourceSinkType="Return" />
+				</flow>
+			</flows>
+		</method>
+		<method id="int nextInt(int)">
+			<flows>
+				<flow isAlias="false" typeChecking="false">
+					<from sourceSinkType="Field" />
+					<to sourceSinkType="Return" />
+				</flow>
+			</flows>
+		</method>
+		<method id="long nextLong()">
+			<flows>
+				<flow isAlias="false" typeChecking="false">
+					<from sourceSinkType="Field" />
+					<to sourceSinkType="Return" />
+				</flow>
+			</flows>
+		</method>
+		<method id="boolean nextBoolean()">
+			<flows>
+				<flow isAlias="false" typeChecking="false">
+					<from sourceSinkType="Field" />
+					<to sourceSinkType="Return" />
+				</flow>
+			</flows>
+		</method>
+		<method id="float nextFloat()">
+			<flows>
+				<flow isAlias="false" typeChecking="false">
+					<from sourceSinkType="Field" />
+					<to sourceSinkType="Return" />
+				</flow>
+			</flows>
+		</method>
+		<method id="double nextDouble()">
+			<flows>
+				<flow isAlias="false" typeChecking="false">
+					<from sourceSinkType="Field" />
+					<to sourceSinkType="Return" />
+				</flow>
+			</flows>
+		</method>
+		<method id="double nextGaussian()">
+			<flows>
+				<flow isAlias="false" typeChecking="false">
+					<from sourceSinkType="Field" />
+					<to sourceSinkType="Return" />
+				</flow>
+			</flows>
+		</method>
 	</methods>
 </summary>