Bugfix: properly handle primitive types in source/sink definition files + removed some useless output

Author: StevenArzt

soot-infoflow-android/src/soot/jimple/infoflow/android/source/AccessPathBasedSourceSinkManager.java

@@ -31,6 +31,7 @@
 import soot.jimple.infoflow.sourcesSinks.manager.SinkInfo;
 import soot.jimple.infoflow.sourcesSinks.manager.SourceInfo;
 import soot.jimple.infoflow.util.SystemClassHandler;
+import soot.jimple.infoflow.util.TypeUtils;
 
 /**
  * SourceSinkManager for Android applications. This class uses precise access
@@ -192,7 +193,7 @@ private AccessPath getAccessPathFromDef(Value baseVal, AccessPathTuple apt, Info
 		SootField[] fields = new SootField[apt.getFields().length];
 		for (int i = 0; i < fields.length; i++) {
 			SootClass lastFieldClass = i == 0 ? baseClass : Scene.v().getSootClass(apt.getFieldTypes()[i - 1]);
-			Type fieldType = RefType.v(apt.getFieldTypes()[i]);
+			Type fieldType = TypeUtils.getTypeFromString(apt.getFieldTypes()[i]);
 			String fieldName = apt.getFields()[i];
 			SootField fld = lastFieldClass.getFieldUnsafe(fieldName, fieldType);
 			if (fld == null) {

soot-infoflow-android/src/soot/jimple/infoflow/android/source/parsers/xml/XMLSourceSinkParser.java

@@ -417,9 +417,8 @@ public static XMLSourceSinkParser fromFile(String fileName) throws IOException {
 
 	public static XMLSourceSinkParser fromFile(String fileName, ICategoryFilter categoryFilter) throws IOException {
 		logger.info(String.format("Loading sources and sinks from %s...", fileName));
-		if (!verifyXML(getStream(fileName))) {
-			throw new IOException("The XML-File isn't valid, schema validation failed.");
-		}
+		verifyXML(getStream(fileName));
+
 		InputStream inputStream = getStream(fileName);
 		try {
 			return fromStream(inputStream, categoryFilter);
@@ -541,36 +540,29 @@ private XMLSourceSinkParser(InputStream stream, ICategoryFilter categoryFilter)
 	 * 
 	 * @param fileName
 	 *            of the XML
-	 * @return true = valid XML false = invalid XML
 	 * @throws IOException
 	 */
-	private static boolean verifyXML(InputStream inp) throws IOException {
+	private static void verifyXML(InputStream inp) throws IOException {
 		SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA);
 
 		// Read the schema
 		StreamSource xsdFile = new StreamSource(ResourceUtils.getResourceStream(XSD_FILE_PATH));
 
 		StreamSource xmlFile = new StreamSource(inp);
-		boolean validXML = false;
 		try {
 			Schema schema = sf.newSchema(xsdFile);
 			Validator validator = schema.newValidator();
 			try {
 				validator.validate(xmlFile);
-				validXML = true;
 			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			if (!validXML) {
-				new IOException("File isn't  valid against the xsd");
+				throw new IOException("File isn't  valid against the xsd", e);
 			}
 		} catch (SAXException e) {
-			e.printStackTrace();
+			throw new IOException("File isn't  valid against the xsd", e);
 		} finally {
 			xsdFile.getInputStream().close();
 			xmlFile.getInputStream().close();
 		}
-		return validXML;
 	}
 
 	@Override