requested changes

jpstotz · May 27, 2024 · c5165e0 · c5165e0
1 parent 9036ad6
commit c5165e0
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/src/main/java/soot/dexpler/DexFillArrayDataTransformer.java b/src/main/java/soot/dexpler/DexFillArrayDataTransformer.java
@@ -70,6 +70,8 @@
 public class DexFillArrayDataTransformer extends BodyTransformer {
   private static final Logger logger = LoggerFactory.getLogger(DexFillArrayDataTransformer.class);
 
+  private static final int MAX_RECURSION_DEPTH = 5;
+
   public static DexFillArrayDataTransformer v() {
     return new DexFillArrayDataTransformer();
   }
@@ -92,7 +94,7 @@ protected void internalTransform(final Body body, String phaseName, Map<String,
 
           Local l = (Local) leftArray.getBase();
           List<Type> arrayTypes = new LinkedList<>();
-          checkArrayDefinitions(l, ass, defs, arrayTypes);
+          checkArrayDefinitions(l, ass, defs, arrayTypes, MAX_RECURSION_DEPTH);
           if (arrayTypes.isEmpty()) {
             throw new InternalError("Failed to determine the array type ");
           }
@@ -124,8 +126,14 @@ protected void internalTransform(final Body body, String phaseName, Map<String,
    * @param defs
    * @param arrayTypes
    *          result list containing the discovered array type(s)
+   * @param maxDepth
    */
-  private void checkArrayDefinitions(Local l, Unit u, LocalDefs defs, List<Type> arrayTypes) {
+  private void checkArrayDefinitions(Local l, Unit u, LocalDefs defs, List<Type> arrayTypes, int maxDepth) {
+    if (maxDepth <= 0) {
+      // Avoid infinite recursion
+      logger.warn("Recursion depth limit reached - aborting");
+      return;
+    }
     List<Unit> assDefs = defs.getDefsOfAt(l, u);
     for (Unit d : assDefs) {
       if (d instanceof AssignStmt) {
@@ -135,9 +143,7 @@ private void checkArrayDefinitions(Local l, Unit u, LocalDefs defs, List<Type> a
           // array is assigned from a newly created array
           NewArrayExpr newArray = (NewArrayExpr) source;
           arrayTypes.add(newArray.getBaseType());
-          continue;
-        }
-        if (source instanceof InvokeExpr) {
+        } else if (source instanceof InvokeExpr) {
           // array is assigned from the return value of a function
           InvokeExpr invExpr = (InvokeExpr) source;
           Type aType = invExpr.getMethodRef().getReturnType();
@@ -146,15 +152,13 @@ private void checkArrayDefinitions(Local l, Unit u, LocalDefs defs, List<Type> a
                 + "does not return an array type. Invocation: " + invExpr.getMethodRef());
           }
           arrayTypes.add(((ArrayType) aType).getArrayElementType());
-          continue;
-        }
-        if (source instanceof Local) {
+        } else if (source instanceof Local) {
           // our array is defined by an assignment from another array => check the definition of that other array.
           Local newLocal = (Local) source; // local of the "other array"
-          checkArrayDefinitions(newLocal, d, defs, arrayTypes);
-          continue;
+          checkArrayDefinitions(newLocal, d, defs, arrayTypes, maxDepth - 1);
+        } else {
+          throw new InternalError("Unsupported array definition statement: " + d);
         }
-        throw new InternalError("Unsupported array definition statement: " + d);
       }
     }