Skip to content

ctypes: remove use of legacy unicode API #12340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
methane merged 4 commits into from
Apr 19, 2019
Merged

ctypes: remove use of legacy unicode API #12340

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5513ad6
ctypes: remove use of legacy unicode API
methane Mar 15, 2019
4b8b223
fix
methane Mar 15, 2019
22a78c1
fix
methane Mar 15, 2019
c5e6102
Apply suggestions from code review
brettcannon Apr 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@methane
methane committed Mar 15, 2019
commit 4b8b223a03136507732cbcfe3fd340f07959fd4e
7 changes: 5 additions & 2 deletions Modules/_ctypes/cfield.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,15 +1419,18 @@ BSTR_set(void *ptr, PyObject *value, Py_ssize_t size)

/* create a BSTR from value */
if (value) {
Py_ssize_t wsize = PyUnicode_AsWideChar(value, NULL, 0);
if (wsize < 0) {
Py_ssize_t wsize;
wchar_t *wvalue = PyUnicode_AsWideCharString(value, &wsize);
if (wvalue == NULL) {
return NULL;
}
if ((unsigned) wsize != wsize) {
PyErr_SetString(PyExc_ValueError, "String too long for BSTR");
PyMem_Free(wvalue);
return NULL;
}
bstr = SysAllocStringLen(wvalue, (unsigned)wsize);
PyMem_Free(wvalue);
} else
bstr = NULL;

Expand Down