diff options
| author | Thomas Heller <theller@ctypes.org> | 2009-09-04 18:37:03 (GMT) |
|---|---|---|
| committer | Thomas Heller <theller@ctypes.org> | 2009-09-04 18:37:03 (GMT) |
| commit | e83c938e210b7631687f2be49512d637bb5b70b9 (patch) | |
| tree | 4aad3b193ecfae95b047cecdf90f6ecac08f87e2 /Modules | |
| parent | c35adc082d40edce91e3a5edf86f50b566413123 (diff) | |
| download | cpython-e83c938e210b7631687f2be49512d637bb5b70b9.zip cpython-e83c938e210b7631687f2be49512d637bb5b70b9.tar.gz cpython-e83c938e210b7631687f2be49512d637bb5b70b9.tar.bz2 | |
Merged revisions 74664 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r74664 | thomas.heller | 2009-09-04 20:24:41 +0200 (Fr, 04 Sep 2009) | 1 line
Issue 6239: ctypes.c_char_p return value must return bytes.
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ctypes/cfield.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c index d7966a5..f7fd7fa 100644 --- a/Modules/_ctypes/cfield.c +++ b/Modules/_ctypes/cfield.c @@ -1428,7 +1428,8 @@ z_get(void *ptr, Py_ssize_t size) return NULL; } #endif - return PyUnicode_FromString(*(char **)ptr); + return PyBytes_FromStringAndSize(*(char **)ptr, + strlen(*(char **)ptr)); } else { Py_INCREF(Py_None); return Py_None; |