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

Issue #18408: Fix _Pickler_New() and _Unpickler_New(): initialize all 

attributes before handling errors

_Pickler_New() now calls PyObject_GC_Del() instead of Py_DECREF() on error,
because the pickle object is created using PyObject_GC_New().

Fix a crash in the destructor when an attribute is not initiallized.
This commit is contained in:
Victor Stinner 2013-07-11 22:56:25 +02:00
parent 3bf5f530d9
commit 68c8ea25f1
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Modules/_pickle.c
View File

@ -774,18 +774,15 @@ _Pickler_New(void)
self->fast_nesting = 0; self->fast_nesting = 0;
self->fix_imports = 0; self->fix_imports = 0;
self->fast_memo = NULL; self->fast_memo = NULL;
self->memo = PyMemoTable_New();
if (self->memo == NULL) {
Py_DECREF(self);
return NULL;
}
self->max_output_len = WRITE_BUF_SIZE; self->max_output_len = WRITE_BUF_SIZE;
self->output_len = 0; self->output_len = 0;
self->memo = PyMemoTable_New();
self->output_buffer = PyBytes_FromStringAndSize(NULL, self->output_buffer = PyBytes_FromStringAndSize(NULL,
self->max_output_len); self->max_output_len);
if (self->output_buffer == NULL) {
Py_DECREF(self); if (self->memo == NULL || self->output_buffer == NULL) {
PyObject_GC_Del(self);
return NULL; return NULL;
} }
return self; return self;
@ -1136,20 +1133,6 @@ _Unpickler_New(void)
if (self == NULL) if (self == NULL)
return NULL; return NULL;
self->stack = (Pdata *)Pdata_New();
if (self->stack == NULL) {
Py_DECREF(self);
return NULL;
}
memset(&self->buffer, 0, sizeof(Py_buffer));
self->memo_size = 32;
self->memo = _Unpickler_NewMemo(self->memo_size);
if (self->memo == NULL) {
Py_DECREF(self);
return NULL;
}
self->arg = NULL; self->arg = NULL;
self->pers_func = NULL; self->pers_func = NULL;
self->input_buffer = NULL; self->input_buffer = NULL;
@ -1167,6 +1150,15 @@ _Unpickler_New(void)
self->marks_size = 0; self->marks_size = 0;
self->proto = 0; self->proto = 0;
self->fix_imports = 0; self->fix_imports = 0;
memset(&self->buffer, 0, sizeof(Py_buffer));
self->memo_size = 32;
self->memo = _Unpickler_NewMemo(self->memo_size);
self->stack = (Pdata *)Pdata_New();
if (self->memo == NULL || self->stack == NULL) {
Py_DECREF(self);
return NULL;
}
return self; return self;
} }