diff options
| -rw-r--r-- | bindings/python/llvm/object.py | 13 | ||||
| -rw-r--r-- | bindings/python/llvm/tests/test_object.py | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/bindings/python/llvm/object.py b/bindings/python/llvm/object.py index bba20d28b1..4e912ed5da 100644 --- a/bindings/python/llvm/object.py +++ b/bindings/python/llvm/object.py @@ -78,7 +78,10 @@ Here are some examples on how to perform iteration: """ from ctypes import c_char_p +from ctypes import c_char +from ctypes import POINTER from ctypes import c_uint64 +from ctypes import string_at from .common import CachedProperty from .common import LLVMObject @@ -211,7 +214,12 @@ class Section(LLVMObject): if self.expired: raise Exception('Section instance has expired.') - return lib.LLVMGetSectionContents(self) + siz = self.size + + r = lib.LLVMGetSectionContents(self) + if r: + return string_at(r, siz) + return None @CachedProperty def address(self): @@ -462,7 +470,8 @@ def register_library(library): library.LLVMGetSectionSize.restype = c_uint64 library.LLVMGetSectionContents.argtypes = [c_object_p] - library.LLVMGetSectionContents.restype = c_char_p + # Can't use c_char_p here as it isn't a NUL-terminated string. + library.LLVMGetSectionContents.restype = POINTER(c_char) library.LLVMGetSectionAddress.argtypes = [c_object_p] library.LLVMGetSectionAddress.restype = c_uint64 diff --git a/bindings/python/llvm/tests/test_object.py b/bindings/python/llvm/tests/test_object.py index 5662d2240e..3f92d8155b 100644 --- a/bindings/python/llvm/tests/test_object.py +++ b/bindings/python/llvm/tests/test_object.py @@ -23,6 +23,7 @@ class TestObjectFile(TestBase): assert isinstance(section.size, long) assert isinstance(section.contents, str) assert isinstance(section.address, long) + assert len(section.contents) == section.size self.assertGreater(count, 0) |