Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.5

This commit is contained in:
Benjamin Peterson 2016-09-06 20:42:17 -07:00
parent 19ab0fd456 33d2a492d0
commit 4b9abf3a27
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Objects/unicodeobject.c
View File

@ -5229,7 +5229,7 @@ PyUnicode_DecodeUTF32Stateful(const char *s,
mark is skipped, in all other modes, it is copied to the output mark is skipped, in all other modes, it is copied to the output
stream as-is (giving a ZWNBSP character). */ stream as-is (giving a ZWNBSP character). */
if (bo == 0 && size >= 4) { 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) { if (bom == 0x0000FEFF) {
bo = -1; bo = -1;
q += 4; q += 4;
@ -5271,7 +5271,7 @@ PyUnicode_DecodeUTF32Stateful(const char *s,
Py_ssize_t pos = writer.pos; Py_ssize_t pos = writer.pos;
if (le) { if (le) {
do { 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) if (ch > maxch)
break; break;
if (kind != PyUnicode_1BYTE_KIND && if (kind != PyUnicode_1BYTE_KIND &&
@ -5283,7 +5283,7 @@ PyUnicode_DecodeUTF32Stateful(const char *s,
} }
else { else {
do { 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) if (ch > maxch)
break; break;
if (kind != PyUnicode_1BYTE_KIND && if (kind != PyUnicode_1BYTE_KIND &&