summaryrefslogtreecommitdiff
path: root/bindings
diff options
context:
space:
mode:
authorAnders Waldenborg <anders@0x63.nu>2014-04-25 06:25:15 +0000
committerAnders Waldenborg <anders@0x63.nu>2014-04-25 06:25:15 +0000
commit53258e6f9e6a884597200718358e9d500c9fc9d7 (patch)
treeb756242027eacabb454888ee5d575a2333961bd5 /bindings
parent3d79151a142c7e233221f883762daaca26b4ceb3 (diff)
downloadllvm-53258e6f9e6a884597200718358e9d500c9fc9d7.tar.gz
llvm-53258e6f9e6a884597200718358e9d500c9fc9d7.tar.bz2
llvm-53258e6f9e6a884597200718358e9d500c9fc9d7.tar.xz
[python] Fix getting section contents.
The returnvalue was handled as c_char_p which ment that ctypes handled it as a NUL-terminated string making it cut the contents at first NUL (or even worse - overrunning the buffer if it doesn't contain a NUL). Differential Revision: http://reviews.llvm.org/D3474 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207199 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'bindings')
-rw-r--r--bindings/python/llvm/object.py13
-rw-r--r--bindings/python/llvm/tests/test_object.py1
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)