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

merge 3.5

This commit is contained in:
Benjamin Peterson 2015-06-27 14:18:44 -05:00
parent 91672617d5 7763c68dcd
commit 3ad880a98a
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -463,6 +463,8 @@ Library
lines from the code object, fixing an issue when a lambda function is used as lines from the code object, fixing an issue when a lambda function is used as
decorator argument. Patch by Thomas Ballinger and Allison Kaptur. decorator argument. Patch by Thomas Ballinger and Allison Kaptur.
- Fix possible integer overflows in the pickle module.
- Issue #22931: Allow '[' and ']' in cookie values. - Issue #22931: Allow '[' and ']' in cookie values.
- The keywords attribute of functools.partial is now always a dictionary. - The keywords attribute of functools.partial is now always a dictionary.

26
Modules/_pickle.c
View File

@ -439,9 +439,7 @@ Pdata_grow(Pdata *self)
if (new_allocated > (size_t)PY_SSIZE_T_MAX - allocated) if (new_allocated > (size_t)PY_SSIZE_T_MAX - allocated)
goto nomemory; goto nomemory;
new_allocated += allocated; new_allocated += allocated;
if (new_allocated > ((size_t)PY_SSIZE_T_MAX / sizeof(PyObject *))) PyMem_RESIZE(data, PyObject *, new_allocated);
goto nomemory;
data = PyMem_REALLOC(data, new_allocated * sizeof(PyObject *));
if (data == NULL) if (data == NULL)
goto nomemory; goto nomemory;
@ -671,7 +669,7 @@ PyMemoTable_Copy(PyMemoTable *self)
/* The table we get from _New() is probably smaller than we wanted. /* The table we get from _New() is probably smaller than we wanted.
Free it and allocate one that's the right size. */ Free it and allocate one that's the right size. */
PyMem_FREE(new->mt_table); PyMem_FREE(new->mt_table);
new->mt_table = PyMem_MALLOC(self->mt_allocated * sizeof(PyMemoEntry)); new->mt_table = PyMem_NEW(PyMemoEntry, self->mt_allocated);
if (new->mt_table == NULL) { if (new->mt_table == NULL) {
PyMem_FREE(new); PyMem_FREE(new);
PyErr_NoMemory(); PyErr_NoMemory();
@ -766,7 +764,7 @@ _PyMemoTable_ResizeTable(PyMemoTable *self, Py_ssize_t min_size)
/* Allocate new table. */ /* Allocate new table. */
oldtable = self->mt_table; oldtable = self->mt_table;
self->mt_table = PyMem_MALLOC(new_size * sizeof(PyMemoEntry)); self->mt_table = PyMem_NEW(PyMemoEntry, new_size);
if (self->mt_table == NULL) { if (self->mt_table == NULL) {
self->mt_table = oldtable; self->mt_table = oldtable;
PyErr_NoMemory(); PyErr_NoMemory();
@ -1272,16 +1270,14 @@ static int
_Unpickler_ResizeMemoList(UnpicklerObject *self, Py_ssize_t new_size) _Unpickler_ResizeMemoList(UnpicklerObject *self, Py_ssize_t new_size)
{ {
Py_ssize_t i; Py_ssize_t i;
PyObject **memo;
assert(new_size > self->memo_size); assert(new_size > self->memo_size);
memo = PyMem_REALLOC(self->memo, new_size * sizeof(PyObject *)); PyMem_RESIZE(self->memo, PyObject *, new_size);
if (memo == NULL) { if (self->memo == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
return -1; return -1;
} }
self->memo = memo;
for (i = self->memo_size; i < new_size; i++) for (i = self->memo_size; i < new_size; i++)
self->memo[i] = NULL; self->memo[i] = NULL;
self->memo_size = new_size; self->memo_size = new_size;
@ -1325,7 +1321,7 @@ _Unpickler_MemoPut(UnpicklerObject *self, Py_ssize_t idx, PyObject *value)
static PyObject ** static PyObject **
_Unpickler_NewMemo(Py_ssize_t new_size) _Unpickler_NewMemo(Py_ssize_t new_size)
{ {
PyObject **memo = PyMem_MALLOC(new_size * sizeof(PyObject *)); PyObject **memo = PyMem_NEW(PyObject *, new_size);
if (memo == NULL) { if (memo == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
return NULL; return NULL;
@ -6032,7 +6028,6 @@ load_mark(UnpicklerObject *self)
if ((self->num_marks + 1) >= self->marks_size) { if ((self->num_marks + 1) >= self->marks_size) {
size_t alloc; size_t alloc;
Py_ssize_t *marks;
/* Use the size_t type to check for overflow. */ /* Use the size_t type to check for overflow. */
alloc = ((size_t)self->num_marks << 1) + 20; alloc = ((size_t)self->num_marks << 1) + 20;
@ -6043,15 +6038,14 @@ load_mark(UnpicklerObject *self)
} }
if (self->marks == NULL) if (self->marks == NULL)
marks = (Py_ssize_t *) PyMem_Malloc(alloc * sizeof(Py_ssize_t)); self->marks = PyMem_NEW(Py_ssize_t, alloc);
else else
marks = (Py_ssize_t *) PyMem_Realloc(self->marks, PyMem_RESIZE(self->marks, Py_ssize_t, alloc);
alloc * sizeof(Py_ssize_t)); if (self->marks == NULL) {
if (marks == NULL) { self->marks_size = 0;
PyErr_NoMemory(); PyErr_NoMemory();
return -1; return -1;
} }
self->marks = marks;
self->marks_size = (Py_ssize_t)alloc; self->marks_size = (Py_ssize_t)alloc;
} }