fixed an NPE

Author: StevenArzt

soot-infoflow-android/src/soot/jimple/infoflow/android/entryPointCreators/AndroidEntryPointCreator.java

@@ -91,9 +91,8 @@ public class AndroidEntryPointCreator extends AbstractAndroidEntryPointCreator i
 	 * registers a list of classes to be automatically scanned for Android lifecycle
 	 * methods
 	 * 
-	 * @param components
-	 *            The list of classes to be automatically scanned for Android
-	 *            lifecycle methods
+	 * @param components The list of classes to be automatically scanned for Android
+	 *                   lifecycle methods
 	 */
 	public AndroidEntryPointCreator(ProcessManifest manifest, Collection<SootClass> components) {
 		this.manifest = manifest;
@@ -325,8 +324,8 @@ private void initializeApplicationClass() {
 			for (SootMethod smCallback : callbacks) {
 				// Is this a special callback class? We have callbacks that model activity
 				// lifecycle events and ones that model generic events (e.g., low memory)
-				if (Scene.v().getOrMakeFastHierarchy().canStoreType(smCallback.getDeclaringClass().getType(),
-						scActCallbacks.getType()))
+				if (scActCallbacks != null && Scene.v().getOrMakeFastHierarchy()
+						.canStoreType(smCallback.getDeclaringClass().getType(), scActCallbacks.getType()))
 					activityLifecycleCallbacks.put(smCallback.getDeclaringClass(), smCallback.getSignature());
 				else
 					applicationCallbackClasses.put(smCallback.getDeclaringClass(), smCallback.getSignature());
@@ -357,8 +356,7 @@ private void initializeApplicationClass() {
 	/**
 	 * Removes if statements that jump to the fall-through successor
 	 * 
-	 * @param body
-	 *            The body from which to remove unnecessary if statements
+	 * @param body The body from which to remove unnecessary if statements
 	 */
 	private void eliminateFallthroughIfs(Body body) {
 		boolean changed = false;
@@ -382,10 +380,10 @@ private void eliminateFallthroughIfs(Body body) {
 	/**
 	 * Adds calls to the callback methods defined in the application class
 	 * 
-	 * @param applicationClass
-	 *            The class in which the user-defined application is implemented
-	 * @param applicationLocal
-	 *            The local containing the instance of the user-defined application
+	 * @param applicationClass The class in which the user-defined application is
+	 *                         implemented
+	 * @param applicationLocal The local containing the instance of the user-defined
+	 *                         application
 	 */
 	private void addApplicationCallbackMethods() {
 		if (!this.callbackFunctions.containsKey(applicationClass))
@@ -473,11 +471,10 @@ public ComponentEntryPointCollection getComponentToEntryPointInfo() {
 	 * Sets the list of callback functions to be integrated into the Android
 	 * lifecycle
 	 * 
-	 * @param callbackFunctions
-	 *            The list of callback functions to be integrated into the Android
-	 *            lifecycle. This is a mapping from the Android element class
-	 *            (activity, service, etc.) to the list of callback methods for that
-	 *            element.
+	 * @param callbackFunctions The list of callback functions to be integrated into
+	 *                          the Android lifecycle. This is a mapping from the
+	 *                          Android element class (activity, service, etc.) to
+	 *                          the list of callback methods for that element.
 	 */
 	public void setCallbackFunctions(MultiMap<SootClass, SootMethod> callbackFunctions) {
 		this.callbackFunctions = callbackFunctions;
@@ -522,9 +519,8 @@ public void reset() {
 	/**
 	 * Sets the Android components for which a dummy main method shall be created
 	 * 
-	 * @param components
-	 *            The Android components for which a dummy main method shall be
-	 *            created
+	 * @param components The Android components for which a dummy main method shall
+	 *                   be created
 	 */
 	public void setComponents(Collection<SootClass> components) {
 		this.components = components;
@@ -533,9 +529,8 @@ public void setComponents(Collection<SootClass> components) {
 	/**
 	 * Removes all methods that have been generated by this entry point creator
 	 * 
-	 * @param removeClass
-	 *            True if the generated class shall also be removed. False to only
-	 *            remove the methods, but keep the class
+	 * @param removeClass True if the generated class shall also be removed. False
+	 *                    to only remove the methods, but keep the class
 	 */
 	public void removeGeneratedMethods(boolean removeClass) {
 		// Remove the dummy main method itself