Merge pull request #616 from timll/develop

Small fixes

Author: StevenArzt

soot-infoflow-summaries/summariesManual/org.json.JSONObject.xml

@@ -730,22 +730,38 @@
 		<method id="java.lang.String toString()">
 			<flows>
 				<flow isAlias="false" typeChecking="false">
-					<from sourceSinkType="Field" />
+					<from sourceSinkType="Field"
+						  AccessPath="[org.json.JSONObject: java.lang.Object[] values]"
+						  AccessPathTypes="[java.lang.Object[]]"/>
+					<to sourceSinkType="Return" />
+				</flow>
+				<flow isAlias="false" typeChecking="false">
+					<from sourceSinkType="Field"
+						  AccessPath="[org.json.JSONArray: java.lang.String[] keys]"
+						  AccessPathTypes="[java.lang.Object[]]"/>
 					<to sourceSinkType="Return" />
 				</flow>
 			</flows>
 		</method>
 		<method id="java.lang.String toString(int)">
 			<flows>
 				<flow isAlias="false" typeChecking="false">
-					<from sourceSinkType="Field" />
+					<from sourceSinkType="Field"
+						  AccessPath="[org.json.JSONObject: java.lang.Object[] values]"
+						  AccessPathTypes="[java.lang.Object[]]"/>
+					<to sourceSinkType="Return" />
+				</flow>
+				<flow isAlias="false" typeChecking="false">
+					<from sourceSinkType="Field"
+						  AccessPath="[org.json.JSONArray: java.lang.String[] keys]"
+						  AccessPathTypes="[java.lang.Object[]]"/>
 					<to sourceSinkType="Return" />
 				</flow>
 			</flows>
 		</method>
 		<method id="java.lang.String valueToString(java.lang.Object)">
 			<flows>
-				<flow isAlias="false" typeChecking="false">
+				<flow isAlias="false" typeChecking="false" cutSubfields="true">
 					<from sourceSinkType="Parameter" ParameterIndex="0" />
 					<to sourceSinkType="Return" />
 				</flow>

soot-infoflow/src/soot/jimple/infoflow/results/xml/InfoflowResultsSerializer.java

@@ -12,6 +12,7 @@
 import soot.jimple.infoflow.InfoflowConfiguration;
 import soot.jimple.infoflow.data.AccessPath;
 import soot.jimple.infoflow.data.AccessPathFragment;
+import soot.jimple.infoflow.data.SootMethodAndClass;
 import soot.jimple.infoflow.results.InfoflowPerformanceData;
 import soot.jimple.infoflow.results.InfoflowResults;
 import soot.jimple.infoflow.results.ResultSinkInfo;
@@ -209,7 +210,8 @@ private void writeSourceInfo(ResultSourceInfo source, XMLStreamWriter writer) th
 		ISourceSinkDefinition def = source.getDefinition();
 		if (def instanceof MethodSourceSinkDefinition) {
 			MethodSourceSinkDefinition ms = (MethodSourceSinkDefinition) def;
-			writer.writeAttribute(XmlConstants.Attributes.methodSourceSinkDefinition, ms.getMethod().getSignature());
+			if (ms.getMethod() != null)
+				writer.writeAttribute(XmlConstants.Attributes.methodSourceSinkDefinition, ms.getMethod().getSignature());
 		}
 
 		writeAdditionalSourceInfo(source, writer);
@@ -271,7 +273,8 @@ private void writeSinkInfo(ResultSinkInfo sink, XMLStreamWriter writer) throws X
 		ISourceSinkDefinition def = sink.getDefinition();
 		if (def instanceof MethodSourceSinkDefinition) {
 			MethodSourceSinkDefinition ms = (MethodSourceSinkDefinition) def;
-			writer.writeAttribute(XmlConstants.Attributes.methodSourceSinkDefinition, ms.getMethod().getSignature());
+			if (ms.getMethod() != null)
+				writer.writeAttribute(XmlConstants.Attributes.methodSourceSinkDefinition, ms.getMethod().getSignature());
 		}
 		writeAdditionalSinkInfo(sink, writer);
 		writeAccessPath(sink.getAccessPath(), writer);

soot-infoflow/src/soot/jimple/infoflow/sourcesSinks/manager/BaseSourceSinkManager.java

@@ -333,7 +333,7 @@ protected Collection<ISourceSinkDefinition> getInverseSourceDefinition(Stmt sCal
 
 			// Only difference to getSource
 			if (!SystemClassHandler.v().isTaintVisible(ap, callee))
-				return null;
+				return Collections.emptySet();
 
 			Collection<ISourceSinkDefinition> defs = getSourceDefinition(callee);
 			if (defs.size() > 0)