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

Merged revisions 78392 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78392 | victor.stinner | 2010-02-24 00:16:07 +0100 (mer., 24 févr. 2010) | 4 lines

  Issue #7649: Fix u'%c' % char for character in range 0x80..0xFF

  => raise an UnicodeDecodeError. Patch written by Ezio Melotti.
........
This commit is contained in:
Victor Stinner 2010-02-23 23:20:14 +00:00
parent 35523dc899
commit f7270ba58f
3 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/unicodeobject.c
View file

@ -8357,6 +8357,7 @@ formatchar(Py_UNICODE *buf,
size_t buflen,
PyObject *v)
{
PyObject *s;
/* presume that the buffer is at least 2 characters long */
if (PyUnicode_Check(v)) {
if (PyUnicode_GET_SIZE(v) != 1)
@ -8367,7 +8368,14 @@ formatchar(Py_UNICODE *buf,
else if (PyString_Check(v)) {
if (PyString_GET_SIZE(v) != 1)
goto onError;
buf[0] = (Py_UNICODE)PyString_AS_STRING(v)[0];
/* #7649: if the char is a non-ascii (i.e. in range(0x80,0x100)) byte
string, "u'%c' % char" should fail with a UnicodeDecodeError */
s = PyUnicode_FromStringAndSize(PyString_AS_STRING(v), 1);
/* if the char is not decodable return -1 */
if (s == NULL)
return -1;
buf[0] = PyUnicode_AS_UNICODE(s)[0];
Py_DECREF(s);
}
else {