Refactoring sink propagation rule to be more flexible

Author: MarcMil

soot-infoflow/src/soot/jimple/infoflow/problems/rules/forward/SinkPropagationRule.java

@@ -81,8 +81,7 @@ private void checkForSink(Abstraction d1, Abstraction source, Stmt stmt, final V
 				if (aliasing.mayAlias(val, ap.getPlainValue())) {
 					SinkInfo sinkInfo = sourceSinkManager.getSinkInfo(stmt, getManager(), source.getAccessPath());
 					if (sinkInfo != null) {
-						if (!getResults().addResult(new AbstractionAtSink(sinkInfo.getDefinitions(), source, stmt)))
-							killState = true;
+						registerTaintResult(sinkInfo, new AbstractionAtSink(sinkInfo.getDefinitions(), source, stmt));
 					}
 				}
 			}
@@ -151,10 +150,8 @@ public Collection<Abstraction> propagateCallToReturnFlow(Abstraction d1, Abstrac
 
 					// If we have already seen the same taint at the same sink, there is no need to
 					// propagate this taint any further.
-					if (sinkInfo != null
-							&& !getResults().addResult(new AbstractionAtSink(sinkInfo.getDefinitions(), source, stmt))) {
-						killState = true;
-					}
+					if (sinkInfo != null)
+						registerTaintResult(sinkInfo, new AbstractionAtSink(sinkInfo.getDefinitions(), source, stmt));
 				}
 			}
 		}
@@ -180,9 +177,8 @@ public Collection<Abstraction> propagateReturnFlow(Collection<Abstraction> calle
 			if (matches && source.isAbstractionActive() && ssm != null && aliasing != null
 					&& aliasing.mayAlias(source.getAccessPath().getPlainValue(), returnStmt.getOp())) {
 				SinkInfo sinkInfo = ssm.getSinkInfo(returnStmt, getManager(), source.getAccessPath());
-				if (sinkInfo != null
-						&& !getResults().addResult(new AbstractionAtSink(sinkInfo.getDefinitions(), source, returnStmt)))
-					killState = true;
+				if (sinkInfo != null)
+					registerTaintResult(sinkInfo, new AbstractionAtSink(sinkInfo.getDefinitions(), source, returnStmt));
 			}
 		}
 
@@ -193,4 +189,19 @@ public Collection<Abstraction> propagateReturnFlow(Collection<Abstraction> calle
 		return null;
 	}
 
+	/**
+	 * Registers a taint result
+	 * @param sinkInfo information about the sink (must not be null)
+	 * @param abstractionAtSink the abstraction at sink (must not be null)
+	 */
+	protected void registerTaintResult(SinkInfo sinkInfo, AbstractionAtSink abstractionAtSink) {
+		boolean continueDataFlow = getResults().addResult(abstractionAtSink);
+		if (!continueDataFlow)
+			setKillState();
+	}
+
+	protected void setKillState() {
+		killState = true;
+	}
+
 }