Fix TryItem writing

vova7878 · Jun 3, 2024 · 071c9aa · 071c9aa
1 parent 1de81bf
commit 071c9aa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/com/v7878/dex/CodeItem.java b/src/main/java/com/v7878/dex/CodeItem.java
@@ -166,6 +166,8 @@ public void write(WriteContext context, RandomOutput out) {
         out.position(insns_start + insns_size);
 
         if (tries_size != 0) {
+            tries.sort(TryItem.COMPARATOR);
+
             out.alignPositionAndFillZeros(TryItem.ALIGNMENT);
 
             RandomOutput tries_out = out.duplicate(out.position());

diff --git a/src/main/java/com/v7878/dex/TryItem.java b/src/main/java/com/v7878/dex/TryItem.java
@@ -27,11 +27,22 @@
 import com.v7878.dex.util.SparseArray;
 import com.v7878.misc.Checks;
 
+import java.util.Comparator;
 import java.util.Map;
 import java.util.Objects;
 
 public final class TryItem implements Mutable {
 
+    public static final Comparator<TryItem> COMPARATOR = (a, b) -> {
+        int out = Integer.compare(a.start_addr, b.start_addr);
+        if (out != 0) {
+            return out;
+        }
+
+        // a.start_addr == b.start_addr, but a != b
+        throw new IllegalStateException("try items are overlapping: " + a + " " + b);
+    };
+
     public static final int SIZE = 8;
     public static final int ALIGNMENT = 4;