Merge branch 'develop' of github.com:secure-software-engineering/FlowDroid into develop

Author: StevenArzt

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

@@ -209,7 +209,10 @@ private Set<Abstraction> computeAliases(final DefinitionStmt defStmt, Value left
 							ArrayRef arrayRef = (ArrayRef) leftValue;
 							newType = TypeUtils.buildArrayOrAddDimension(newType, arrayRef.getType().getArrayType());
 						} else if (defStmt.getRightOp() instanceof ArrayRef) {
-							newType = ((ArrayType) newType).getElementType();
+							if (newType instanceof ArrayType)
+								newType = ((ArrayType) newType).getElementType();
+							else
+								newType = null;
 						} else {
 							// Type check
 							if (!manager.getTypeUtils().checkCast(source.getAccessPath(), leftValue.getType()))
@@ -318,17 +321,19 @@ else if (defStmt.getRightOp() instanceof LengthExpr) {
 								targetType = TypeUtils.buildArrayOrAddDimension(targetType,
 										arrayRef.getType().getArrayType());
 							} else if (leftValue instanceof ArrayRef) {
-								assert source.getAccessPath().getBaseType() instanceof ArrayType;
-								targetType = ((ArrayType) targetType).getElementType();
-
 								// If we have a type of java.lang.Object, we try
 								// to tighten it
 								if (TypeUtils.isObjectLikeType(targetType))
 									targetType = rightValue.getType();
+								else if (targetType instanceof ArrayType)
+									targetType = ((ArrayType) targetType).getElementType();
+								else
+									targetType = null;
 
 								// If the types do not match, the right side
 								// cannot be an alias
-								if (!manager.getTypeUtils().checkCast(rightValue.getType(), targetType))
+								if (targetType != null
+										&& !manager.getTypeUtils().checkCast(rightValue.getType(), targetType))
 									addRightValue = false;
 							}
 						}

soot-infoflow/src/soot/jimple/infoflow/problems/rules/ArrayPropagationRule.java

@@ -69,7 +69,10 @@ && getAliasing().mayAlias(rightBase, source.getAccessPath().getPlainValue())) {
 				// We must remove one layer of array typing, e.g., A[][] -> A[]
 				Type targetType = source.getAccessPath().getBaseType();
 				assert targetType instanceof ArrayType;
-				targetType = ((ArrayType) targetType).getElementType();
+				if (targetType instanceof ArrayType)
+					targetType = ((ArrayType) targetType).getElementType();
+				else
+					targetType = null;
 
 				// Create the new taint abstraction
 				ArrayTaintType arrayTaintType = source.getAccessPath().getArrayTaintType();