(The fix has been slightly adjusted.)

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.
........
This commit is contained in:
Thomas Heller 2009-02-10 18:59:04 +00:00
parent a06f44b143
commit 465c802044
2 changed files with 5 additions and 1 deletions

View File

@ -163,6 +163,9 @@ Core and Builtins
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.

View File

@ -645,14 +645,15 @@ static int ConvParam(PyObject *obj, Py_ssize_t index, struct argument *pa)
#ifdef CTYPES_UNICODE
if (PyUnicode_Check(obj)) {
pa->ffi_type = &ffi_type_pointer;
#ifdef HAVE_USABLE_WCHAR_T
pa->ffi_type = &ffi_type_pointer;
pa->value.p = PyUnicode_AS_UNICODE(obj);
Py_INCREF(obj);
pa->keep = obj;
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);