diff options
| author | Mark Dickinson <mdickinson@enthought.com> | 2012-11-25 14:37:43 +0000 |
|---|---|---|
| committer | Mark Dickinson <mdickinson@enthought.com> | 2012-11-25 14:37:43 +0000 |
| commit | cb878352fec4111a2b5490e12d2df9c4cae45579 (patch) | |
| tree | a2d21729b4a3870889cfcd56a571efa0aa1572dd /Python/codecs.c | |
| parent | 5cd62b7fe17e8004a4f137cf9164e4e71bb1bd70 (diff) | |
| parent | 9770925980a2c52aadd6aa1a6f3c243f9a62bae9 (diff) | |
| download | cpython-cb878352fec4111a2b5490e12d2df9c4cae45579.tar.gz | |
Issue #16546: merge fix from 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; } |