mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-25 11:15:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-35372: Fix the code page decoder for input > 2 GiB. (GH-10848)

Browse source
This commit is contained in:
Serhiy Storchaka 2018-12-03 10:36:45 +02:00 • committed by GitHub
parent 062cbb6772
commit 4013c17911
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Objects/unicodeobject.c
View file

@ -7211,7 +7211,7 @@ decode_code_page_errors(UINT code_page,
"in the target code page.";
/* each step cannot decode more than 1 character, but a character can be
represented as a surrogate pair */
wchar_t buffer[2], *startout, *out;
wchar_t buffer[2], *out;
int insize;
Py_ssize_t outsize;
PyObject *errorHandler = NULL;
@ -7248,7 +7248,7 @@ decode_code_page_errors(UINT code_page,
*v = (PyObject*)_PyUnicode_New(size * Py_ARRAY_LENGTH(buffer));
if (*v == NULL)
goto error;
startout = PyUnicode_AS_UNICODE(*v);
out = PyUnicode_AS_UNICODE(*v);
}
else {
/* Extend unicode object */
@ -7259,11 +7259,10 @@ decode_code_page_errors(UINT code_page,
}
if (unicode_resize(v, n + size * Py_ARRAY_LENGTH(buffer)) < 0)
goto error;
startout = PyUnicode_AS_UNICODE(*v) + n;
out = PyUnicode_AS_UNICODE(*v) + n;
}
/* Decode the byte string character per character */
out = startout;
while (in < endin)
{
/* Decode a character */
@ -7318,7 +7317,7 @@ decode_code_page_errors(UINT code_page,
*out = 0;
/* Extend unicode object */
outsize = out - startout;
outsize = out - PyUnicode_AS_UNICODE(*v);
assert(outsize <= PyUnicode_WSTR_LENGTH(*v));
if (unicode_resize(v, outsize) < 0)
goto error;