Virtualization
/
capstone
mirror of https://gitlab.com/qemu-project/capstone.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix NPE when first instruction to disassemble is broken. 

Return null instead.
This commit is contained in:
Keve Müller 2015-11-12 18:54:30 +01:00 committed by Nguyen Anh Quynh
parent 59e301333b
commit 0440c6708f
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bindings/java/capstone/Capstone.java
View File

@ -435,17 +435,36 @@ public class Capstone {
return cs.cs_close(ns.handleRef);
}
// disassemble until either no more code, or encounter broken insn.
/**
* Disassemble instructions from @code assumed to be located at @address,
* stop when encountering first broken instruction.
*
* @param code The source machine code bytes.
* @param address The address of the first machine code byte.
* @return the array of successfully disassembled instructions, null if no instruction could be disassembled.
*/
public CsInsn[] disasm(byte[] code, long address) {
return disasm(code, address, 0);
}
// disassemble maximum @count instructions, or until encounter broken insn.
/**
* Disassemble up to @count instructions from @code assumed to be located at @address,
* stop when encountering first broken instruction.
*
* @param code The source machine code bytes.
* @param address The address of the first machine code byte.
* @param count The maximum number of instructions to disassemble, 0 for no maximum.
* @return the array of successfully disassembled instructions, null if no instruction could be disassembled.
*/
public CsInsn[] disasm(byte[] code, long address, long count) {
PointerByReference insnRef = new PointerByReference();
NativeLong c = cs.cs_disasm(ns.csh, code, new NativeLong(code.length), address, new NativeLong(count), insnRef);
if (0 == c.intValue()) {
return null;
}
Pointer p = insnRef.getValue();
_cs_insn byref = new _cs_insn(p);