Merge pull request #704 from MarcMil/extensibility

Fix a bug where the path could miss statements

Author: StevenArzt

soot-infoflow/src/soot/jimple/infoflow/AbstractInfoflow.java

@@ -1095,7 +1095,7 @@ else if (reason instanceof TimeoutReason)
 					// After the last intermediate result has been computed,
 					// we need to re-process those abstractions that
 					// received new neighbors in the meantime
-					builder.runIncrementalPathCompuation();
+					builder.runIncrementalPathComputation();
 
 					try {
 						resultExecutor.awaitCompletion();

soot-infoflow/src/soot/jimple/infoflow/data/Abstraction.java

@@ -168,12 +168,11 @@ public Abstraction deriveNewAbstraction(AccessPath p, Stmt currentStmt) {
 		return deriveNewAbstraction(p, currentStmt, isImplicit);
 	}
 
-	public Abstraction deriveNewAbstraction(AccessPath p, Stmt currentStmt, boolean isImplicit) {
-		// If the new abstraction looks exactly like the current one, there is
-		// no need to create a new object
-		if (this.accessPath.equals(p) && this.currentStmt == currentStmt && this.isImplicit == isImplicit)
-			return this;
+	public Abstraction deriveDefinitelyNewAbstraction(AccessPath p, Stmt currentStmt) {
+		return deriveDefinitelyNewAbstraction(p, currentStmt, isImplicit);
+	}
 
+	public Abstraction deriveDefinitelyNewAbstraction(AccessPath p, Stmt currentStmt, boolean isImplicit) {
 		Abstraction abs = deriveNewAbstractionMutable(p, currentStmt);
 		if (abs == null)
 			return null;
@@ -182,6 +181,15 @@ public Abstraction deriveNewAbstraction(AccessPath p, Stmt currentStmt, boolean
 		return abs;
 	}
 
+	public Abstraction deriveNewAbstraction(AccessPath p, Stmt currentStmt, boolean isImplicit) {
+		// If the new abstraction looks exactly like the current one, there is
+		// no need to create a new object
+		if (this.accessPath.equals(p) && this.currentStmt == currentStmt && this.isImplicit == isImplicit)
+			return this;
+
+		return deriveDefinitelyNewAbstraction(p, currentStmt, isImplicit);
+	}
+
 	protected Abstraction deriveNewAbstractionMutable(AccessPath p, Stmt currentStmt) {
 		// An abstraction needs an access path
 		if (p == null)

soot-infoflow/src/soot/jimple/infoflow/data/pathBuilders/BatchPathBuilder.java

@@ -81,8 +81,8 @@ public InfoflowResults getResults() {
 	}
 
 	@Override
-	public void runIncrementalPathCompuation() {
-		innerBuilder.runIncrementalPathCompuation();
+	public void runIncrementalPathComputation() {
+		innerBuilder.runIncrementalPathComputation();
 	}
 
 	@Override

soot-infoflow/src/soot/jimple/infoflow/data/pathBuilders/ContextInsensitivePathBuilder.java

@@ -152,7 +152,7 @@ protected boolean triggerComputationForNeighbors() {
 	}
 
 	@Override
-	public void runIncrementalPathCompuation() {
+	public void runIncrementalPathComputation() {
 		Set<AbstractionAtSink> incrementalAbs = new HashSet<>();
 		for (Abstraction abs : pathCache.keySet())
 			for (SourceContextAndPath scap : pathCache.get(abs)) {

soot-infoflow/src/soot/jimple/infoflow/data/pathBuilders/ContextInsensitiveSourceFinder.java

@@ -108,7 +108,7 @@ protected Runnable getTaintPathTask(AbstractionAtSink abs) {
 	}
 
 	@Override
-	public void runIncrementalPathCompuation() {
+	public void runIncrementalPathComputation() {
 		// not implemented
 	}
 

soot-infoflow/src/soot/jimple/infoflow/data/pathBuilders/ContextSensitivePathBuilder.java

@@ -244,7 +244,7 @@ protected boolean checkForSource(Abstraction abs, SourceContextAndPath scap) {
 	}
 
 	@Override
-	public void runIncrementalPathCompuation() {
+	public void runIncrementalPathComputation() {
 		Set<AbstractionAtSink> incrementalAbs = new HashSet<>();
 		for (Abstraction abs : pathCache.keySet())
 			for (SourceContextAndPath scap : pathCache.get(abs)) {

soot-infoflow/src/soot/jimple/infoflow/data/pathBuilders/EmptyPathBuilder.java

@@ -28,7 +28,7 @@ public void addResultAvailableHandler(OnPathBuilderResultAvailable handler) {
 	}
 
 	@Override
-	public void runIncrementalPathCompuation() {
+	public void runIncrementalPathComputation() {
 	}
 
 	@Override

soot-infoflow/src/soot/jimple/infoflow/data/pathBuilders/IAbstractionPathBuilder.java

@@ -56,6 +56,6 @@ public interface OnPathBuilderResultAvailable {
 	 * computed. This method is usually called after the taint propagation has
 	 * finished when incremental path building has been used in between.
 	 */
-	public void runIncrementalPathCompuation();
+	public void runIncrementalPathComputation();
 
 }

soot-infoflow/src/soot/jimple/infoflow/data/pathBuilders/RecursivePathBuilder.java

@@ -174,7 +174,7 @@ public InfoflowResults getResults() {
 	}
 
 	@Override
-	public void runIncrementalPathCompuation() {
+	public void runIncrementalPathComputation() {
 		// not implemented
 	}
 

soot-infoflow/src/soot/jimple/infoflow/problems/TaintPropagationResults.java

@@ -63,7 +63,7 @@ public boolean addResult(AbstractionAtSink resultAbs) {
 
 		// Construct the abstraction at the sink
 		Abstraction abs = resultAbs.getAbstraction();
-		abs = abs.deriveNewAbstraction(abs.getAccessPath(), resultAbs.getSinkStmt());
+		abs = abs.deriveDefinitelyNewAbstraction(abs.getAccessPath(), resultAbs.getSinkStmt());
 		abs.setCorrespondingCallSite(resultAbs.getSinkStmt());
 
 		// Reduce the incoming abstraction