FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-36346: Do not use legacy Unicode C API in ctypes. by serhiy-storchaka · Pull Request #21429 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

bpo-36346: Do not use legacy Unicode C API in ctypes. #21429

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
serhiy-storchaka merged 1 commit into from
Jul 10, 2020
Conversation 1 Commits 1 Checks 0 Files changed
Merged

bpo-36346: Do not use legacy Unicode C API in ctypes. #21429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .c  (3) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
33 changes: 14 additions & 19 deletions Modules/_ctypes/_ctypes.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1366,8 +1366,6 @@ WCharArray_get_value(CDataObject *self, void *Py_UNUSED(ignored))
static int
WCharArray_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored))
{
Py_ssize_t result = 0;

if (value == NULL) {
PyErr_SetString(PyExc_TypeError,
"can't delete attribute");
Expand All @@ -1378,29 +1376,24 @@ WCharArray_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored
"unicode string expected instead of %s instance",
Py_TYPE(value)->tp_name);
return -1;
} else
Py_INCREF(value);
}

Py_ssize_t size = self->b_size / sizeof(wchar_t);
Py_ssize_t len = PyUnicode_AsWideChar(value, NULL, 0);
if (len < 0) {
return -1;
}
// PyUnicode_AsWideChar() returns number of wchars including trailing null byte,
// when it is called with NULL.
if (((size_t)len-1) > self->b_size/sizeof(wchar_t)) {
assert(len > 0);
if (len - 1 > size) {
PyErr_SetString(PyExc_ValueError, "string too long");
result = -1;
goto done;
}
result = PyUnicode_AsWideChar(value,
(wchar_t *)self->b_ptr,
self->b_size/sizeof(wchar_t));
if (result >= 0 && (size_t)result < self->b_size/sizeof(wchar_t))
((wchar_t *)self->b_ptr)[result] = (wchar_t)0;
done:
Py_DECREF(value);

return result >= 0 ? 0 : -1;
return -1;
}
if (PyUnicode_AsWideChar(value, (wchar_t *)self->b_ptr, size) < 0) {
return -1;
}
return 0;
}

static PyGetSetDef WCharArray_getsets[] = {
Expand Down Expand Up @@ -3484,10 +3477,12 @@ _validate_paramflags(PyTypeObject *type, PyObject *paramflags)
for (i = 0; i < len; ++i) {
PyObject *item = PyTuple_GET_ITEM(paramflags, i);
int flag;
char *name;
PyObject *name = Py_None;
PyObject *defval;
PyObject *typ;
if (!PyArg_ParseTuple(item, "i|ZO", &flag, &name, &defval)) {
if (!PyArg_ParseTuple(item, "i|OO", &flag, &name, &defval) ||
!(name == Py_None || PyUnicode_Check(name)))
{
PyErr_SetString(PyExc_TypeError,
"paramflags must be a sequence of (int [,string [,value]]) tuples");
return 0;
Expand Down
10 changes: 5 additions & 5 deletions Modules/_ctypes/callproc.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1300,7 +1300,6 @@ module. load_flags are as defined for LoadLibraryEx in the\n\
Windows API.\n";
static PyObject *load_library(PyObject *self, PyObject *args)
{
const WCHAR *name;
PyObject *nameobj;
int load_flags = 0;
HMODULE hMod;
Expand All @@ -1309,14 +1308,14 @@ static PyObject *load_library(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "U|i:LoadLibrary", &nameobj, &load_flags))
return NULL;

name = _PyUnicode_AsUnicode(nameobj);
if (!name)
return NULL;

if (PySys_Audit("ctypes.dlopen", "O", nameobj) < 0) {
return NULL;
}

WCHAR *name = PyUnicode_AsWideCharString(nameobj, NULL);
if (!name)
return NULL;

Py_BEGIN_ALLOW_THREADS
/* bpo-36085: Limit DLL search directories to avoid pre-loading
* attacks and enable use of the AddDllDirectory function.
Expand All @@ -1325,6 +1324,7 @@ static PyObject *load_library(PyObject *self, PyObject *args)
err = hMod ? 0 : GetLastError();
Py_END_ALLOW_THREADS

PyMem_Free(name);
if (err == ERROR_MOD_NOT_FOUND) {
PyErr_Format(PyExc_FileNotFoundError,
("Could not find module '%.500S' (or one of its "
Expand Down
7 changes: 2 additions & 5 deletions Modules/_ctypes/cfield.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1220,11 +1220,8 @@ U_set(void *ptr, PyObject *value, Py_ssize_t length)
"string too long (%zd, maximum length %zd)",
size, length);
return NULL;
} else if (size < length-1)
/* copy terminating NUL character if there is space */
size += 1;

if (PyUnicode_AsWideChar(value, (wchar_t *)ptr, size) == -1) {
}
if (PyUnicode_AsWideChar(value, (wchar_t *)ptr, length) == -1) {
return NULL;
}

Expand Down
Back | FazBrowse Home | New Git URL