Skip to content

support disassembling bytes from memoryview #1773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kabeor merged 3 commits into from
Nov 13, 2021
Merged

support disassembling bytes from memoryview #1773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d59c50f
support disassembling bytes from memoryview
huettenhain May 28, 2021
684187a
invoke from_buffer only for writeable interfaces
huettenhain Nov 12, 2021
25d898f
adds test and bugfix for memoryview support
huettenhain Nov 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions bindings/python/capstone/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,8 +1099,11 @@ def disasm(self, code, offset, count=0):
print(code)'''
# Pass a bytearray by reference
size = len(code)
if isinstance(code, bytearray):
code = ctypes.byref(ctypes.c_char.from_buffer(code))
view = memoryview(code)
if not view.readonly:
code = ctypes.byref(ctypes.c_char.from_buffer(view))
elif not isinstance(code, bytes):
code = view.tobytes()
res = _cs.cs_disasm(self.csh, code, size, offset, count, ctypes.byref(all_insn))
if res > 0:
try:
Expand All @@ -1127,8 +1130,11 @@ def disasm_lite(self, code, offset, count=0):
all_insn = ctypes.POINTER(_cs_insn)()
size = len(code)
# Pass a bytearray by reference
if isinstance(code, bytearray):
code = ctypes.byref(ctypes.c_char.from_buffer(code))
view = memoryview(code)
if not view.readonly:
code = ctypes.byref(ctypes.c_char.from_buffer(view))
elif not isinstance(code, bytes):
code = view.tobytes()
res = _cs.cs_disasm(self.csh, code, size, offset, count, ctypes.byref(all_insn))
if res > 0:
try:
Expand Down
17 changes: 17 additions & 0 deletions bindings/python/test_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,22 @@ def test_cs_disasm_quick():
print()


def test_different_data_formats():
data = bytes.fromhex('4831C948F7E1043B48BB0A2F62696E2F2F736852530A545F5257545E0F05')
mnemonics = ['xor', 'mul', 'add', 'movabs', 'push', 'pop', 'push', 'push', 'push', 'pop', 'syscall']
disassembler = Cs(CS_ARCH_X86, CS_MODE_64)
for name, code in (
('bytearray', bytearray(data)),
('memoryview of bytearray', memoryview(bytearray(data))),
('memoryview of data', memoryview(data)),
('raw data', data)
):
if mnemonics != [op for _, _, op, _ in disassembler.disasm_lite(code, 0)]:
print('failure in disassemble-lite for %s.' % name)
if mnemonics != [instruction.mnemonic for instruction in disassembler.disasm(code, 0)]:
print('failure in disassemble-full for %s.' % name)


# ## Test class Cs
def test_class():
for arch, mode, code, comment, syntax in all_tests:
Expand Down Expand Up @@ -110,3 +126,4 @@ def test_class():
# print ("*" * 40)
if __name__ == '__main__':
test_class()
test_different_data_formats()