[PATCH] [python] Fix getting section contents.

[Anders Waldenborg]

Hi indygreg,

    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).

http://reviews.llvm.org/D3474

Files:
  bindings/python/llvm/object.py
  bindings/python/llvm/tests/test_object.py

Index: bindings/python/llvm/object.py
===================================================================
--- bindings/python/llvm/object.py
+++ bindings/python/llvm/object.py
@@ -78,7 +78,10 @@
 """
 
 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 @@
         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 @@
     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
Index: bindings/python/llvm/tests/test_object.py
===================================================================
--- bindings/python/llvm/tests/test_object.py
+++ bindings/python/llvm/tests/test_object.py
@@ -23,6 +23,7 @@
             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)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D3474.8780.patch
Type: text/x-patch
Size: 1688 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20140423/5b8f8f1a/attachment.bin>