diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-09-07 03:42:17 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-09-07 03:42:17 (GMT) |
| commit | 4b9abf3a27185aaceb6db39ef1e1fa784f420b4f (patch) | |
| tree | 3071aff1dc4d651ffe54eeab2435706e112e8699 /Objects | |
| parent | 19ab0fd456a79fa1fdfdb543ac423723667cb2d0 (diff) | |
| parent | 33d2a492d0c0c29f526fae1e0f164fe14864cc2e (diff) | |
| download | cpython-4b9abf3a27185aaceb6db39ef1e1fa784f420b4f.zip cpython-4b9abf3a27185aaceb6db39ef1e1fa784f420b4f.tar.gz cpython-4b9abf3a27185aaceb6db39ef1e1fa784f420b4f.tar.bz2 | |
merge 3.5
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/unicodeobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 2279442..10ba57c 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -5229,7 +5229,7 @@ PyUnicode_DecodeUTF32Stateful(const char *s, mark is skipped, in all other modes, it is copied to the output stream as-is (giving a ZWNBSP character). */ if (bo == 0 && size >= 4) { - Py_UCS4 bom = (q[3] << 24) | (q[2] << 16) | (q[1] << 8) | q[0]; + Py_UCS4 bom = ((unsigned int)q[3] << 24) | (q[2] << 16) | (q[1] << 8) | q[0]; if (bom == 0x0000FEFF) { bo = -1; q += 4; @@ -5271,7 +5271,7 @@ PyUnicode_DecodeUTF32Stateful(const char *s, Py_ssize_t pos = writer.pos; if (le) { do { - ch = (q[3] << 24) | (q[2] << 16) | (q[1] << 8) | q[0]; + ch = ((unsigned int)q[3] << 24) | (q[2] << 16) | (q[1] << 8) | q[0]; if (ch > maxch) break; if (kind != PyUnicode_1BYTE_KIND && @@ -5283,7 +5283,7 @@ PyUnicode_DecodeUTF32Stateful(const char *s, } else { do { - ch = (q[0] << 24) | (q[1] << 16) | (q[2] << 8) | q[3]; + ch = ((unsigned int)q[0] << 24) | (q[1] << 16) | (q[2] << 8) | q[3]; if (ch > maxch) break; if (kind != PyUnicode_1BYTE_KIND && |