Fix for SF# 1701409: segfault in c_char_p of ctypes. The repr output

of c_char_p and c_wchar_p has changed as a sideeffect.

diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
index f8b2d75abaa384980594337fad0e88430da39c09..7dff3a7de607f01e0f579a9a211c462f3937f1bf 100644 (file)
--- a/Lib/ctypes/__init__.py
+++ b/Lib/ctypes/__init__.py
@@ -226,6 +226,14 @@ _check_size(c_char)
 
 class c_char_p(_SimpleCData):
     _type_ = "z"
+    if _os.name == "nt":
+        def __repr__(self):
+            if not windll.kernel32.IsBadStringPtrA(self, -1):
+                return "%s(%r)" % (self.__class__.__name__, self.value)
+            return "%s(%s)" % (self.__class__.__name__, cast(self, c_void_p).value)
+    else:
+        def __repr__(self):
+            return "%s(%s)" % (self.__class__.__name__, cast(self, c_void_p).value)
 _check_size(c_char_p, "P")
 
 class c_void_p(_SimpleCData):

diff --git a/Misc/NEWS b/Misc/NEWS
index b5cf34963ebe70e28cd1ac04d6d8d7c3ce1cf1ad..aa023884d85f62a37d018fee82ff721e559a127a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -234,6 +234,10 @@ Core and builtins
 Library
 -------
 
+- Bug #1701409: Fix a segfault in printing ctypes.c_char_p and
+  ctypes.c_wchar_p when they point to an invalid location.  As a
+  sideeffect the representation of these instances has changed.
+
 - tarfile.py: Added "exclude" keyword argument to TarFile.add().
 
 - Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.