diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-12-14 20:14:17 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-12-14 20:14:17 +0200 |
| commit | 13321a29888234527e6ac1b798856a3ac47fcbd2 (patch) | |
| tree | 2dfcfd39e8884fcb96fd3cc84d529ffd91926c7f /Python/codecs.c | |
| parent | 3eab56987c48344d6626b69fd809e1586d61b719 (diff) | |
| parent | 9c67d7bc15c95f049ab6c40eaa2ebbf89a007fe2 (diff) | |
| download | cpython-13321a29888234527e6ac1b798856a3ac47fcbd2.tar.gz | |
#16681: merge with 3.3.
Diffstat (limited to 'Python/codecs.c')
| -rw-r--r-- | Python/codecs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/codecs.c b/Python/codecs.c index fd67d1b9e1..37ae41b1ca 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -761,7 +761,7 @@ PyCodec_SurrogatePassErrors(PyObject *exc) for (i = start; i < end; i++) { /* object is guaranteed to be "ready" */ Py_UCS4 ch = PyUnicode_READ_CHAR(object, i); - if (ch < 0xd800 || ch > 0xdfff) { + if (!Py_UNICODE_IS_SURROGATE(ch)) { /* Not a surrogate, fail with original exception */ PyErr_SetObject(PyExceptionInstance_Class(exc), exc); Py_DECREF(res); @@ -797,7 +797,7 @@ PyCodec_SurrogatePassErrors(PyObject *exc) (p[2] & 0xc0) == 0x80) { /* it's a three-byte code */ ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f); - if (ch < 0xd800 || ch > 0xdfff) + if (!Py_UNICODE_IS_SURROGATE(ch)) /* it's not a surrogate - fail */ ch = 0; } |