diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-02-21 21:13:44 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-02-21 21:13:44 (GMT) |
| commit | 5ed8b2c737a71d6fd56757bd9fe108f2cf886664 (patch) | |
| tree | 5dfc9fd7b3f19fcd1deb7c11e9367f4834c8e0b5 /Objects/unicodeobject.c | |
| parent | ed4c71112a07a2adad9cb26b9b2d790725443b1f (diff) | |
| download | cpython-5ed8b2c737a71d6fd56757bd9fe108f2cf886664.zip cpython-5ed8b2c737a71d6fd56757bd9fe108f2cf886664.tar.gz cpython-5ed8b2c737a71d6fd56757bd9fe108f2cf886664.tar.bz2 | |
Fix PyUnicode_FromFormatV("%c") for non-BMP char
Issue #10830: Fix PyUnicode_FromFormatV("%c") for non-BMP characters on
narrow build.
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 069be7b..57baebd 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -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'); |