diff options
author | Gregory P. Smith <greg@krypto.org> | 2012-11-10 21:10:31 -0800 |
---|---|---|
committer | Gregory P. Smith <greg@krypto.org> | 2012-11-10 21:10:31 -0800 |
commit | 22f9e65bb11ab8dee2562fe5bf4e19dc9ff87bf7 (patch) | |
tree | b2ee3bf7504f2ef298b67d1e70b43138265fd626 /Python/codecs.c | |
parent | f6128db16b5187864ee8da2078d87bd52539fcad (diff) | |
parent | bbdd90ba3a4de0c56d65b1fcc6db37b2730119d6 (diff) | |
download | cpython-22f9e65bb11ab8dee2562fe5bf4e19dc9ff87bf7.tar.gz |
Fixes issue #14396: Handle the odd rare case of waitpid returning 0
when not expected in subprocess.Popen.wait().
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; } |