Merge pull request #39 from danghvu/master

Fix java error when JNA attempts to readField(op) when op_count == 0
_v3_old
Nguyen Anh Quynh 11 years ago
commit 4355c66c95
  1. 4
      bindings/java/Test.java
  2. 4
      bindings/java/TestArm.java
  3. 4
      bindings/java/TestArm64.java
  4. 4
      bindings/java/TestMips.java
  5. 4
      bindings/java/TestX86.java
  6. 3
      bindings/java/capstone/Arm.java
  7. 3
      bindings/java/capstone/Arm64.java
  8. 3
      bindings/java/capstone/Mips.java

@ -1,10 +1,6 @@
/* Capstone Disassembler Engine */ /* Capstone Disassembler Engine */
/* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013> */ /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013> */
import com.sun.jna.Native;
import com.sun.jna.Memory;
import com.sun.jna.Pointer;
import capstone.Capstone; import capstone.Capstone;
public class Test { public class Test {

@ -1,10 +1,6 @@
// Capstone Java binding // Capstone Java binding
// By Nguyen Anh Quynh & Dang Hoang Vu, 2013 // By Nguyen Anh Quynh & Dang Hoang Vu, 2013
import com.sun.jna.Native;
import com.sun.jna.Memory;
import com.sun.jna.Pointer;
import capstone.Capstone; import capstone.Capstone;
import capstone.Arm; import capstone.Arm;

@ -1,10 +1,6 @@
// Capstone Java binding // Capstone Java binding
// By Nguyen Anh Quynh & Dang Hoang Vu, 2013 // By Nguyen Anh Quynh & Dang Hoang Vu, 2013
import com.sun.jna.Native;
import com.sun.jna.Memory;
import com.sun.jna.Pointer;
import capstone.Capstone; import capstone.Capstone;
import capstone.Arm64; import capstone.Arm64;

@ -1,10 +1,6 @@
// Capstone Java binding // Capstone Java binding
// By Nguyen Anh Quynh & Dang Hoang Vu, 2013 // By Nguyen Anh Quynh & Dang Hoang Vu, 2013
import com.sun.jna.Native;
import com.sun.jna.Memory;
import com.sun.jna.Pointer;
import capstone.Capstone; import capstone.Capstone;
import capstone.Mips; import capstone.Mips;

@ -1,10 +1,6 @@
// Capstone Java binding // Capstone Java binding
// By Nguyen Anh Quynh & Dang Hoang Vu, 2013 // By Nguyen Anh Quynh & Dang Hoang Vu, 2013
import com.sun.jna.Native;
import com.sun.jna.Memory;
import com.sun.jna.Pointer;
import capstone.Capstone; import capstone.Capstone;
import capstone.X86; import capstone.X86;

@ -105,7 +105,8 @@ public class Arm {
readField("_writeback"); readField("_writeback");
readField("op_count"); readField("op_count");
op = new Operand[op_count]; op = new Operand[op_count];
readField("op"); if (op_count != 0)
readField("op");
} }
@Override @Override

@ -103,7 +103,8 @@ public class Arm64 {
readField("_writeback"); readField("_writeback");
readField("op_count"); readField("op_count");
op = new Operand[op_count]; op = new Operand[op_count];
readField("op"); if (op_count != 0)
readField("op");
} }
@Override @Override

@ -79,7 +79,8 @@ public class Mips {
public void read() { public void read() {
readField("op_count"); readField("op_count");
op = new Operand[op_count]; op = new Operand[op_count];
readField("op"); if (op_count != 0)
readField("op");
} }
@Override @Override

Loading…
Cancel
Save