[Python-checkins] r69506 - in python/branches/release26-maint: Misc/NEWS Modules/_ctypes/callproc.c

[thomas.heller]

Author: thomas.heller
Date: Tue Feb 10 19:46:11 2009
New Revision: 69506

Log:
Merged revisions 69505 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69505 | thomas.heller | 2009-02-10 19:43:01 +0100 (Di, 10 Feb 2009) | 3 lines
  
  Issue#5203: ctypes segfaults when passing a unicode string to a
  function without argtypes, if HAVE_USABLE_WCHAR_T is false.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/_ctypes/callproc.c

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Tue Feb 10 19:46:11 2009
@@ -80,6 +80,9 @@
 Library
 -------
 
+- Issue #5203: Fixed ctypes segfaults when passing a unicode string to a
+  function without argtypes (only occurs if HAVE_USABLE_WCHAR_T is false).
+
 - Issue #3386: distutils.sysconfig.get_python_lib prefix argument was ignored
   under NT and OS2. Patch by Philip Jenvey.
 

Modified: python/branches/release26-maint/Modules/_ctypes/callproc.c
==============================================================================
--- python/branches/release26-maint/Modules/_ctypes/callproc.c	(original)
+++ python/branches/release26-maint/Modules/_ctypes/callproc.c	Tue Feb 10 19:46:11 2009
@@ -664,6 +664,7 @@
 		return 0;
 #else
 		int size = PyUnicode_GET_SIZE(obj);
+		pa->ffi_type = &ffi_type_pointer;
 		size += 1; /* terminating NUL */
 		size *= sizeof(wchar_t);
 		pa->value.p = PyMem_Malloc(size);