traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.5

This commit is contained in:
Benjamin Peterson 2015-09-26 00:09:39 -07:00
parent 00d4442979 03c59b9bef
commit 5b8854eee0
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -141,6 +141,8 @@ Core and Builtins
Library Library
------- -------
- Prevent overflow in _Unpickler_Read.
- Issue #25047: The XML encoding declaration written by Element Tree now - Issue #25047: The XML encoding declaration written by Element Tree now
respects the letter case given by the user. This restores the ability to respects the letter case given by the user. This restores the ability to
write encoding names in uppercase like "UTF-8", which worked in Python 2. write encoding names in uppercase like "UTF-8", which worked in Python 2.

6
Modules/_pickle.c
View File

@ -1193,6 +1193,12 @@ _Unpickler_Read(UnpicklerObject *self, char **s, Py_ssize_t n)
{ {
Py_ssize_t num_read; Py_ssize_t num_read;
if (self->next_read_idx > PY_SSIZE_T_MAX - n) {
PickleState *st = _Pickle_GetGlobalState();
PyErr_SetString(st->UnpicklingError,
"read would overflow (invalid bytecode)");
return -1;
}
if (self->next_read_idx + n <= self->input_len) { if (self->next_read_idx + n <= self->input_len) {
*s = self->input_buffer + self->next_read_idx; *s = self->input_buffer + self->next_read_idx;
self->next_read_idx += n; self->next_read_idx += n;