mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-19 07:03:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.6] bpo-13617: Reject embedded null characters in wchar* strings. (GH-2302) (#2462)

Browse source 
Based on patch by Victor Stinner.

Add private C API function _PyUnicode_AsUnicode() which is similar to
PyUnicode_AsUnicode(), but checks for null characters..
(cherry picked from commit f7eae0adfc)
This commit is contained in:
Serhiy Storchaka 2017-06-28 09:27:35 +03:00 • committed by GitHub
parent 413c0a92bc
commit 0834905d9b
22 changed files with 115 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Objects/unicodeobject.c
View file

@ -4164,6 +4164,20 @@ PyUnicode_AsUnicode(PyObject *unicode)
return PyUnicode_AsUnicodeAndSize(unicode, NULL);
}
const Py_UNICODE *
_PyUnicode_AsUnicode(PyObject *unicode)
{
Py_ssize_t size;
const Py_UNICODE *wstr;
wstr = PyUnicode_AsUnicodeAndSize(unicode, &size);
if (wstr && wcslen(wstr) != (size_t)size) {
PyErr_SetString(PyExc_ValueError, "embedded null character");
return NULL;
}
return wstr;
}
Py_ssize_t
PyUnicode_GetSize(PyObject *unicode)