[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 llvm-svn: 207199
This commit is contained in:
parent
69d0cf06bc
commit
f3a1acfbf7
|
@ -78,7 +78,10 @@ Here are some examples on how to perform iteration:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from ctypes import c_char_p
|
from ctypes import c_char_p
|
||||||
|
from ctypes import c_char
|
||||||
|
from ctypes import POINTER
|
||||||
from ctypes import c_uint64
|
from ctypes import c_uint64
|
||||||
|
from ctypes import string_at
|
||||||
|
|
||||||
from .common import CachedProperty
|
from .common import CachedProperty
|
||||||
from .common import LLVMObject
|
from .common import LLVMObject
|
||||||
|
@ -211,7 +214,12 @@ class Section(LLVMObject):
|
||||||
if self.expired:
|
if self.expired:
|
||||||
raise Exception('Section instance has 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
|
@CachedProperty
|
||||||
def address(self):
|
def address(self):
|
||||||
|
@ -462,7 +470,8 @@ def register_library(library):
|
||||||
library.LLVMGetSectionSize.restype = c_uint64
|
library.LLVMGetSectionSize.restype = c_uint64
|
||||||
|
|
||||||
library.LLVMGetSectionContents.argtypes = [c_object_p]
|
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.argtypes = [c_object_p]
|
||||||
library.LLVMGetSectionAddress.restype = c_uint64
|
library.LLVMGetSectionAddress.restype = c_uint64
|
||||||
|
|
|
@ -23,6 +23,7 @@ class TestObjectFile(TestBase):
|
||||||
assert isinstance(section.size, long)
|
assert isinstance(section.size, long)
|
||||||
assert isinstance(section.contents, str)
|
assert isinstance(section.contents, str)
|
||||||
assert isinstance(section.address, long)
|
assert isinstance(section.address, long)
|
||||||
|
assert len(section.contents) == section.size
|
||||||
|
|
||||||
self.assertGreater(count, 0)
|
self.assertGreater(count, 0)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue