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

Issue #18408: _pickle.c: Add missing PyErr_NoMemory() on memory allocation failures

This commit is contained in:
Victor Stinner 2013-07-12 00:53:57 +02:00
parent 8ca72e2e3d
commit 4202456cd4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/_pickle.c
View File

@ -436,6 +436,7 @@ PyMemoTable_Copy(PyMemoTable *self)
new->mt_table = PyMem_MALLOC(self->mt_allocated * sizeof(PyMemoEntry)); new->mt_table = PyMem_MALLOC(self->mt_allocated * sizeof(PyMemoEntry));
if (new->mt_table == NULL) { if (new->mt_table == NULL) {
PyMem_FREE(new); PyMem_FREE(new);
PyErr_NoMemory();
return NULL; return NULL;
} }
for (i = 0; i < self->mt_allocated; i++) { for (i = 0; i < self->mt_allocated; i++) {
@ -1003,8 +1004,10 @@ _Unpickler_CopyLine(UnpicklerObject *self, char *line, Py_ssize_t len,
char **result) char **result)
{ {
char *input_line = PyMem_Realloc(self->input_line, len + 1); char *input_line = PyMem_Realloc(self->input_line, len + 1);
if (input_line == NULL) if (input_line == NULL) {
PyErr_NoMemory();
return -1; return -1;
}
memcpy(input_line, line, len); memcpy(input_line, line, len);
input_line[len] = '\0'; input_line[len] = '\0';
@ -1101,8 +1104,10 @@ 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_MALLOC(new_size * sizeof(PyObject *));
if (memo == NULL) if (memo == NULL) {
PyErr_NoMemory();
return NULL; return NULL;
}
memset(memo, 0, new_size * sizeof(PyObject *)); memset(memo, 0, new_size * sizeof(PyObject *));
return memo; return memo;
} }