FIX: Used invalid size of ArtJump.

mar-v-in · Mar 19, 2015 · d018132 · d018132
1 parent e97a8fb
commit d018132
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/lib/src/main/java/de/larma/arthook/HookPage.java b/lib/src/main/java/de/larma/arthook/HookPage.java
@@ -144,7 +144,7 @@ public void update() {
             if (hook.backup != null) {
                 long backupAddr = instructionHelper.toMem(
                         hook.backup.getEntryPointFromQuickCompiledCode());
-                Native.munprotect_verbose(backupAddr, instructionHelper.sizeOfDirectJump());
+                Native.munprotect_verbose(backupAddr, instructionHelper.sizeOfArtJump());
                 Native.memput_verbose(instructionHelper.createArtJump(hook.src.getAddress(),
                         getCallOriginal()), backupAddr);
             }

diff --git a/lib/src/main/java/de/larma/arthook/instrs/Arm32.java b/lib/src/main/java/de/larma/arthook/instrs/Arm32.java
@@ -65,6 +65,11 @@ public byte[] createTargetJump(HookPage.Hook hook) {
         return instructions;
     }
 
+    @Override
+    public int sizeOfArtJump() {
+        return 16;
+    }
+
     @Override
     @Deprecated
     public byte[] createArtJump(long artMethodAddress, long jumpTarget) {

diff --git a/lib/src/main/java/de/larma/arthook/instrs/InstructionHelper.java b/lib/src/main/java/de/larma/arthook/instrs/InstructionHelper.java
@@ -77,6 +77,8 @@ public byte[] createArtJump(ArtMethod targetMethod, int offset) {
                 targetMethod.getEntryPointFromQuickCompiledCode() + offset);
     }
 
+    public abstract int sizeOfArtJump();
+
     public abstract byte[] createArtJump(long artMethodAddress, long jumpTarget);
 
     public byte[] createArtJump(ArtMethod targetMethod) {

diff --git a/lib/src/main/java/de/larma/arthook/instrs/Thumb2.java b/lib/src/main/java/de/larma/arthook/instrs/Thumb2.java
@@ -65,6 +65,11 @@ public int sizeOfTargetJump() {
         return 28;
     }
 
+    @Override
+    public int sizeOfArtJump() {
+        return 16;
+    }
+
     @Override
     public byte[] createArtJump(long artMethodAddress, long jumpTarget) {
         byte[] instructions = new byte[] {