traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid PyUnicode_AS_UNICODE in the UTF-8 encoder

This commit is contained in:
Victor Stinner 2011-11-10 20:21:49 +01:00
parent 3326cb6a36
commit a98b28c1bf
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Objects/unicodeobject.c
View File

@ -4820,11 +4820,18 @@ _PyUnicode_AsUTF8String(PyObject *unicode, const char *errors)
for(k = repsize; k > 0; k--) for(k = repsize; k > 0; k--)
*p++ = *prep++; *p++ = *prep++;
} else /* rep is unicode */ { } else /* rep is unicode */ {
const Py_UNICODE *prep = PyUnicode_AS_UNICODE(rep); enum PyUnicode_Kind repkind;
Py_UNICODE c; void *repdata;
if (PyUnicode_READY(rep) < 0) {
Py_DECREF(rep);
goto error;
}
repkind = PyUnicode_KIND(rep);
repdata = PyUnicode_DATA(rep);
for(k=0; k<repsize; k++) { for(k=0; k<repsize; k++) {
c = prep[k]; Py_UCS4 c = PyUnicode_READ(repkind, repdata, k);
if (0x80 <= c) { if (0x80 <= c) {
raise_encode_exception(&exc, "utf-8", raise_encode_exception(&exc, "utf-8",
unicode, unicode,
@ -4832,7 +4839,7 @@ _PyUnicode_AsUTF8String(PyObject *unicode, const char *errors)
"surrogates not allowed"); "surrogates not allowed");
goto error; goto error;
} }
*p++ = (char)prep[k]; *p++ = (char)c;
} }
} }
Py_DECREF(rep); Py_DECREF(rep);