mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 05:35:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Catch PyUnicode_AS_UNICODE() errors

Browse source
This commit is contained in:
Victor Stinner 2011-11-17 00:45:54 +01:00
parent 6f9568bb1f
commit 1f7951711c
2 changed files with 55 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Objects/unicodeobject.c
View file

@ -3051,9 +3051,13 @@ PyObject *
PyUnicode_EncodeFSDefault(PyObject *unicode)
{
#ifdef HAVE_MBCS
return PyUnicode_EncodeMBCS(PyUnicode_AS_UNICODE(unicode),
PyUnicode_GET_SIZE(unicode),
NULL);
const Py_UNICODE *wstr;
Py_ssize_t wlen;
wstr = PyUnicode_AsUnicodeAndSize(unicode, &wlen);
if (wstr == NULL)
return NULL;
return PyUnicode_EncodeMBCS(wstr, wlen, NULL);
#elif defined(__APPLE__)
return _PyUnicode_AsUTF8String(unicode, "surrogateescape");
#else
@ -3137,10 +3141,15 @@ PyUnicode_AsEncodedString(PyObject *unicode,
(strcmp(lower, "iso-8859-1") == 0))
return _PyUnicode_AsLatin1String(unicode, errors);
#ifdef HAVE_MBCS
else if (strcmp(lower, "mbcs") == 0)
return PyUnicode_EncodeMBCS(PyUnicode_AS_UNICODE(unicode),
PyUnicode_GET_SIZE(unicode),
errors);
else if (strcmp(lower, "mbcs") == 0) {
const Py_UNICODE *wstr;
Py_ssize_t wlen;
wstr = PyUnicode_AsUnicodeAndSize(unicode, &wlen);
if (wstr == NULL)
return NULL;
return PyUnicode_EncodeMBCS(wstr, wlen, errors);
}
#endif
else if (strcmp(lower, "ascii") == 0)
return _PyUnicode_AsASCIIString(unicode, errors);
@ -5148,10 +5157,12 @@ PyUnicode_EncodeUTF32(const Py_UNICODE *s,
PyObject *
PyUnicode_AsUTF32String(PyObject *unicode)
{
return PyUnicode_EncodeUTF32(PyUnicode_AS_UNICODE(unicode),
PyUnicode_GET_SIZE(unicode),
NULL,
0);
const Py_UNICODE *wstr;
Py_ssize_t wlen;
wstr = PyUnicode_AsUnicodeAndSize(unicode, &wlen);
if (wstr == NULL)
return NULL;
return PyUnicode_EncodeUTF32(wstr, wlen, NULL, 0);
}
/* --- UTF-16 Codec ------------------------------------------------------- */