fixed category copying, fixed description being overwritten and added immutable access path tuple

Author: StevenArzt

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

@@ -337,12 +337,15 @@ public void endElement(String uri, String localName, String qName) throws SAXExc
 
 					if (sstype != SourceSinkType.Neither) {
 						AccessPathTuple apt = AccessPathTuple.fromPathElements(pathElements, pathElementTypes, sstype);
-						apt = apt.simplify();
 
 						// Optional description
 						if (description != null && !description.isEmpty())
 							apt.setDescription(description);
 
+						// Simplify the AP after setting the description for not breaking the generic
+						// source definition
+						apt = apt.simplify();
+
 						switch (accessPathParentElement) {
 						case XMLConstants.BASE_TAG:
 							baseAPs.add(apt);

soot-infoflow/src/soot/jimple/infoflow/sourcesSinks/definitions/AccessPathTuple.java

@@ -46,6 +46,14 @@ public class AccessPathTuple {
 		this.sinkSource = sinkSource;
 	}
 
+	AccessPathTuple(AccessPathTuple original) {
+		this.baseType = original.baseType;
+		this.fields = original.fields;
+		this.fieldTypes = original.fields;
+		this.sinkSource = original.sinkSource;
+		this.description = original.description;
+	}
+
 	/**
 	 * Simplified factory method for creating an access path that just denotes the
 	 * base object
@@ -124,7 +132,7 @@ public SourceSinkType getSourceSinkType() {
 	 */
 	public static AccessPathTuple getBlankSourceTuple() {
 		if (SOURCE_TUPLE == null)
-			SOURCE_TUPLE = create(true, false);
+			SOURCE_TUPLE = new ImmutableAccessPathTuple(create(true, false));
 		return SOURCE_TUPLE;
 	}
 
@@ -135,7 +143,7 @@ public static AccessPathTuple getBlankSourceTuple() {
 	 */
 	public static AccessPathTuple getBlankSinkTuple() {
 		if (SINK_TUPLE == null)
-			SINK_TUPLE = create(false, true);
+			SINK_TUPLE = new ImmutableAccessPathTuple(create(false, true));
 		return SINK_TUPLE;
 	}
 

soot-infoflow/src/soot/jimple/infoflow/sourcesSinks/definitions/FieldSourceSinkDefinition.java

@@ -104,7 +104,9 @@ protected FieldSourceSinkDefinition buildNewDefinition(Set<AccessPathTuple> acce
 	 * @return The new source/sink definition
 	 */
 	protected FieldSourceSinkDefinition buildNewDefinition(String fieldSignature, Set<AccessPathTuple> accessPaths) {
-		return new FieldSourceSinkDefinition(fieldSignature, accessPaths);
+		FieldSourceSinkDefinition fssd = new FieldSourceSinkDefinition(fieldSignature, accessPaths);
+		fssd.setCategory(category);
+		return fssd;
 	}
 
 	@Override
@@ -143,7 +145,7 @@ public IAccessPathBasedSourceSinkDefinition filter(Collection<AccessPathTuple> t
 					filteredAPs.add(ap);
 		}
 		FieldSourceSinkDefinition def = buildNewDefinition(fieldSignature, filteredAPs);
-		def.setCategory(category);
+		def.category = category;
 		return def;
 	}
 

soot-infoflow/src/soot/jimple/infoflow/sourcesSinks/definitions/ISourceSinkDefinition.java

@@ -9,9 +9,9 @@
 public interface ISourceSinkDefinition {
 
 	/**
-	 * Sets the category to which this source or sink belonga
+	 * Sets the category to which this source or sink belongs
 	 * 
-	 * @param category The category to which this source or sink belonga
+	 * @param category The category to which this source or sink belongs
 	 */
 	public void setCategory(ISourceSinkCategory category);
 

soot-infoflow/src/soot/jimple/infoflow/sourcesSinks/definitions/ImmutableAccessPathTuple.java

@@ -0,0 +1,20 @@
+package soot.jimple.infoflow.sourcesSinks.definitions;
+
+/**
+ * Immutable version of the {@link AccessPathTuple}
+ * 
+ * @author Steven Arzt
+ *
+ */
+public class ImmutableAccessPathTuple extends AccessPathTuple {
+
+	public ImmutableAccessPathTuple(AccessPathTuple parent) {
+		super(parent);
+	}
+
+	@Override
+	public void setDescription(String description) {
+		throw new RuntimeException("Immutable object cannot be modified");
+	}
+
+}

soot-infoflow/src/soot/jimple/infoflow/sourcesSinks/definitions/MethodSourceSinkDefinition.java

@@ -322,7 +322,7 @@ public MethodSourceSinkDefinition getSinkOnlyDefinition() {
 	protected MethodSourceSinkDefinition buildNewDefinition(Set<AccessPathTuple> baseAPTs,
 			Set<AccessPathTuple>[] paramAPTs, Set<AccessPathTuple> returnAPTs) {
 		MethodSourceSinkDefinition def = buildNewDefinition(method, baseAPTs, paramAPTs, returnAPTs, callType);
-		def.setCategory(category);
+		def.category = category;
 		return def;
 	}
 

soot-infoflow/src/soot/jimple/infoflow/sourcesSinks/definitions/StatementSourceSinkDefinition.java

@@ -122,7 +122,9 @@ public IAccessPathBasedSourceSinkDefinition filter(Collection<AccessPathTuple> t
 
 	protected StatementSourceSinkDefinition buildNewDefinition(Stmt stmt, Local local,
 			Set<AccessPathTuple> accessPaths) {
-		return new StatementSourceSinkDefinition(stmt, local, accessPaths);
+		StatementSourceSinkDefinition sssd = new StatementSourceSinkDefinition(stmt, local, accessPaths);
+		sssd.category = category;
+		return sssd;
 	}
 
 	@Override