fixed some bugs, improved performance, and added a test case

Author: StevenArzt

soot-infoflow-android/src/soot/jimple/infoflow/android/callbacks/AbstractCallbackAnalyzer.java

@@ -528,7 +528,7 @@ protected void analyzeMethodForViewPagers(SootClass clazz, SootMethod method) {
 			SootMethod getItem = rt.getSootClass().getMethodUnsafe("android.support.v4.app.Fragment getItem(int)");
 			if (getItem == null)
 				getItem = rt.getSootClass().getMethodUnsafe("androidx.fragment.app.Fragment getItem(int)");
-			if (getItem == null)
+			if (getItem == null || !getItem.isConcrete())
 				continue;
 
 			Body b = getItem.retrieveActiveBody();

soot-infoflow-android/src/soot/jimple/infoflow/android/callbacks/DefaultCallbackAnalyzer.java

@@ -230,11 +230,13 @@ private void analyzeRechableMethods(SootClass lifecycleElement, List<MethodOrMet
 				filter.setReachableMethods(rm);
 
 			SootMethod method = reachableMethods.next().method();
-			analyzeMethodForCallbackRegistrations(lifecycleElement, method);
-			analyzeMethodForDynamicBroadcastReceiver(method);
-			analyzeMethodForServiceConnection(method);
-			analyzeMethodForFragmentTransaction(lifecycleElement, method);
-			analyzeMethodForViewPagers(lifecycleElement, method);
+			if (method.isConcrete()) {
+				analyzeMethodForCallbackRegistrations(lifecycleElement, method);
+				analyzeMethodForDynamicBroadcastReceiver(method);
+				analyzeMethodForServiceConnection(method);
+				analyzeMethodForFragmentTransaction(lifecycleElement, method);
+				analyzeMethodForViewPagers(lifecycleElement, method);
+			}
 		}
 	}
 

soot-infoflow-android/src/soot/jimple/infoflow/android/entryPointCreators/components/AbstractComponentEntryPointCreator.java

@@ -274,7 +274,7 @@ public void assignIntent(SootClass hostComponent, SootMethod method, int indexOf
 					 * RuntimeException: couldn't find method getIntent(*) in
 					 * com.google.android.gcm.GCMBroadcastReceiver
 					 */
-					SootMethod m = hostComponent.getMethodByName("getIntent");
+					SootMethod m = hostComponent.getMethod("android.content.Intent getIntent()");
 					if (stmt.getTag(SimulatedCodeElementTag.TAG_NAME) != null) {
 						if (stmt.getInvokeExpr().getMethod().equals(m))
 							break;

soot-infoflow-android/src/soot/jimple/infoflow/android/resources/LayoutFileParser.java

@@ -306,8 +306,8 @@ private void parseIncludeAttributes(String layoutFile, AXmlNode rootNode) {
 						return;
 					}
 					if (!(targetRes instanceof StringResource)) {
-						logger.warn("Invalid target node for include tag in layout XML, was %s",
-								targetRes.getClass().getName());
+						logger.warn(String.format("Invalid target node for include tag in layout XML, was %s",
+								targetRes.getClass().getName()));
 						return;
 					}
 					String targetFile = ((StringResource) targetRes).getValue();

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

@@ -26,10 +26,12 @@
 import soot.SootField;
 import soot.SootMethod;
 import soot.Unit;
+import soot.Value;
 import soot.jimple.AssignStmt;
 import soot.jimple.FieldRef;
 import soot.jimple.IntConstant;
 import soot.jimple.InvokeExpr;
+import soot.jimple.NullConstant;
 import soot.jimple.Stmt;
 import soot.jimple.StringConstant;
 import soot.jimple.infoflow.InfoflowConfiguration.LayoutMatchingMode;
@@ -204,7 +206,7 @@ else if (assign.getRightOp() instanceof FieldRef) {
 						if (tag instanceof IntegerConstantValueTag)
 							return ((IntegerConstantValueTag) tag).getIntValue();
 						else
-							logger.error("Constant %s was of unexpected type", field.toString());
+							logger.error(String.format("Constant %s was of unexpected type", field.toString()));
 				} else if (assign.getRightOp() instanceof InvokeExpr) {
 					InvokeExpr inv = (InvokeExpr) assign.getRightOp();
 					if (inv.getMethod().getName().equals("getIdentifier")
@@ -214,7 +216,8 @@ else if (assign.getRightOp() instanceof FieldRef) {
 						// well-known
 						// Android API method for resource handling
 						if (inv.getArgCount() != 3) {
-							logger.error("Invalid parameter count (%d) for call to getIdentifier", inv.getArgCount());
+							logger.error(String.format("Invalid parameter count (%d) for call to getIdentifier",
+									inv.getArgCount()));
 							return null;
 						}
 
@@ -228,13 +231,17 @@ else if (assign.getRightOp() instanceof FieldRef) {
 							resName = ((StringConstant) inv.getArg(0)).value;
 						if (inv.getArg(1) instanceof StringConstant)
 							resID = ((StringConstant) inv.getArg(1)).value;
-						if (inv.getArg(2) instanceof StringConstant)
-							packageName = ((StringConstant) inv.getArg(2)).value;
-						else if (inv.getArg(2) instanceof Local)
-							packageName = findLastStringAssignment(stmt, (Local) inv.getArg(2), cfg);
+
+						Value thirdArg = inv.getArg(2);
+						if (thirdArg instanceof StringConstant)
+							packageName = ((StringConstant) thirdArg).value;
+						else if (thirdArg instanceof Local)
+							packageName = findLastStringAssignment(stmt, (Local) thirdArg, cfg);
+						else if (thirdArg instanceof NullConstant)
+							return null;
 						else {
-							logger.error("Unknown parameter type %s in call to getIdentifier",
-									inv.getArg(2).getClass().getName());
+							logger.error(String.format("Unknown parameter type %s in call to getIdentifier",
+									inv.getArg(2).getClass().getName()));
 							return null;
 						}
 

soot-infoflow/test/soot/jimple/infoflow/test/collect/ConcurrentCountingMapTest.java

@@ -0,0 +1,20 @@
+package soot.jimple.infoflow.test.collect;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import soot.jimple.infoflow.collect.ConcurrentCountingMap;
+
+public class ConcurrentCountingMapTest {
+
+	@Test
+	public void keySetTest() {
+		ConcurrentCountingMap<String> map = new ConcurrentCountingMap<>();
+		map.increment("Hello");
+		map.increment("World");
+		for (String k : map.keySet())
+			assertEquals(new Integer(1), map.get(k));
+	}
+
+}