Merge pull request #848 from MarcMil/extensible

Fix searching for static methods & NPE

Author: StevenArzt

soot-infoflow/src/soot/jimple/infoflow/codeOptimization/InterproceduralConstantValuePropagator.java

@@ -834,7 +834,8 @@ private void propagateConstantsIntoCallee(SootMethod sm) {
 			if (excludedMethods != null && icfg.isReachable(callSite)) {
 				SootMethod caller = icfg.getMethodOf(callSite);
 				// synthetic methods e.g. created by FlowDroid are excluded by default
-				if (excludedMethods.contains(caller) || caller.hasTag(SimulatedCodeElementTag.TAG_NAME)) {
+				if (caller == null || excludedMethods.contains(caller)
+						|| caller.hasTag(SimulatedCodeElementTag.TAG_NAME)) {
 					logger.trace("Ignoring calls from {}", caller);
 					continue;
 				}

soot-infoflow/src/soot/jimple/infoflow/util/SootUtils.java

@@ -44,8 +44,13 @@ public static List<Value> getUseAndDefValues(Unit u) {
 	 */
 	public static SootMethod findMethod(SootClass currentClass, String subsignature) {
 		Scene sc = Scene.v();
-		return sc.getOrMakeFastHierarchy().resolveMethod(currentClass,
+		SootMethod m = sc.getOrMakeFastHierarchy().resolveMethod(currentClass,
 				sc.makeMethodRef(currentClass, subsignature, false), true);
+		if (m == null) {
+			//maybe the method is static
+			m = currentClass.getMethodUnsafe(subsignature);
+		}
+		return m;
 	}
 
 }