diff options
| author |   Thomas Heller <theller@ctypes.org> | 2009-02-10 18:59:04 +0000 |
|---|---|---|
| committer | Thomas Heller <theller@ctypes.org> | 2009-02-10 18:59:04 +0000 |
| commit | 465c802044a5d9367997b4030e3435722c811911 (patch) | |
| tree | fba6d088a6e6772703a6bca5d598b9dddcbf76c3 | |
| parent | Merged revisions 69500 via svnmerge from (diff) | |
| download | cpython-465c802044a5d9367997b4030e3435722c811911.tar.gz cpython-465c802044a5d9367997b4030e3435722c811911.tar.bz2 cpython-465c802044a5d9367997b4030e3435722c811911.zip | |
(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.
........
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_ctypes/callproc.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS index 44a893ff0ec..185e5cf4c79 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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. diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 3bd6d664ef5..c153ae2c196 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -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); |