From 1d645d06fc91121b1b5ec32bf36729618f1754ed Mon Sep 17 00:00:00 2001
From: REAndroid <REAndroid@users.noreply.github.com>
Date: Thu, 2 Jan 2025 20:33:38 +0100
Subject: [PATCH] [DEX] Check zero width of array-data

---
 .../reandroid/dex/ins/InsArrayDataList.java   | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/reandroid/dex/ins/InsArrayDataList.java b/src/main/java/com/reandroid/dex/ins/InsArrayDataList.java
index c6cd72cd1..1877ef7c7 100644
--- a/src/main/java/com/reandroid/dex/ins/InsArrayDataList.java
+++ b/src/main/java/com/reandroid/dex/ins/InsArrayDataList.java
@@ -37,7 +37,7 @@ public class InsArrayDataList extends CountedBlockList<InsArrayDataList.ArrayDat
     private final IntegerReference widthReference;
 
     public InsArrayDataList(IntegerReference widthReference, IntegerReference countReference) {
-        super(new EntryCreator(widthReference), countReference);
+        super(new EntryCreator(widthReference), new WidthCheckingReference(widthReference, countReference));
         this.widthReference = widthReference;
     }
 
@@ -346,4 +346,30 @@ public ArrayDataEntry newInstance() {
             return new ArrayDataEntry(this.width.get());
         }
     }
+    static class WidthCheckingReference implements IntegerReference {
+
+        private final IntegerReference width;
+        private final IntegerReference reference;
+
+        public WidthCheckingReference(IntegerReference width, IntegerReference reference) {
+            this.width = width;
+            this.reference = reference;
+        }
+        @Override
+        public int get() {
+            if (width.get() == 0) {
+                return 0;
+            }
+            return reference.get();
+        }
+
+        @Override
+        public void set(int value) {
+            reference.set(value);
+        }
+        @Override
+        public String toString() {
+            return Integer.toString(get());
+        }
+    }
 }