[Python-checkins] cpython: Issue #18408: Fix _Pickler_New() and _Unpickler_New(): initialize all
victor.stinner
python-checkins at python.org
Thu Jul 11 23:12:13 CEST 2013
http://hg.python.org/cpython/rev/1a1869baec4c
changeset: 84565:1a1869baec4c
user: Victor Stinner <victor.stinner at gmail.com>
date: Thu Jul 11 22:56:25 2013 +0200
summary:
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.
files:
Modules/_pickle.c | 36 +++++++++++++---------------------
1 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -774,18 +774,15 @@
self->fast_nesting = 0;
self->fix_imports = 0;
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->output_len = 0;
+
+ self->memo = PyMemoTable_New();
self->output_buffer = PyBytes_FromStringAndSize(NULL,
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 self;
@@ -1136,20 +1133,6 @@
if (self == 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->pers_func = NULL;
self->input_buffer = NULL;
@@ -1167,6 +1150,15 @@
self->marks_size = 0;
self->proto = 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;
}
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list