mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-16 07:45:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix PyUnicode_FromFormatV("%c") for non-BMP char

Browse source 
Issue #10830: Fix PyUnicode_FromFormatV("%c") for non-BMP characters on
narrow build.
This commit is contained in:
Victor Stinner 2011-02-21 21:13:44 +00:00
parent ed4c71112a
commit 5ed8b2c737
3 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Objects/unicodeobject.c
View file

@ -813,8 +813,19 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
switch (*f) {
case 'c':
{
#ifndef Py_UNICODE_WIDE
int ordinal = va_arg(count, int);
if (ordinal > 0xffff)
n += 2;
else
n++;
#else
(void)va_arg(count, int);
/* fall through... */
n++;
#endif
break;
}
case '%':
n++;
break;
@ -992,8 +1003,18 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
switch (*f) {
case 'c':
*s++ = va_arg(vargs, int);
{
int ordinal = va_arg(vargs, int);
#ifndef Py_UNICODE_WIDE
if (ordinal > 0xffff) {
ordinal -= 0x10000;
*s++ = 0xD800 | (ordinal >> 10);
*s++ = 0xDC00 | (ordinal & 0x3FF);
} else
#endif
*s++ = ordinal;
break;
}
case 'd':
makefmt(fmt, longflag, longlongflag, size_tflag, zeropad,
width, precision, 'd');