mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[3.11] gh-105375: Explicitly initialise all {Pickler,Unpickler}Object fields (#105686) (#105711) 

* [3.11] gh-105375: Explicitly initialise all {Pickler,Unpickler}Object fields (#105686)

All fields must be explicitly initialised to prevent manipulation of
uninitialised fields in dealloc.

Align initialisation order with the layout of the object structs.

(cherry picked from commit ca3cc4b95d)

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
This commit is contained in:
Erlend E. Aasland 2023-06-13 08:50:00 +02:00 committed by GitHub
parent 261d0b4f0e
commit 36c393c044
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
Modules/_pickle.c
View File

@ -1116,42 +1116,49 @@ _Pickler_Write(PicklerObject *self, const char *s, Py_ssize_t data_len)
static PicklerObject *
_Pickler_New(void)
{
PicklerObject *self;
self = PyObject_GC_New(PicklerObject, &Pickler_Type);
if (self == NULL)
PyMemoTable *memo = PyMemoTable_New();
if (memo == NULL) {
return NULL;
}
const Py_ssize_t max_output_len = WRITE_BUF_SIZE;
PyObject *output_buffer = PyBytes_FromStringAndSize(NULL, max_output_len);
if (output_buffer == NULL) {
goto error;
}
PicklerObject *self = PyObject_GC_New(PicklerObject, &Pickler_Type);
if (self == NULL) {
goto error;
}
self->memo = memo;
self->pers_func = NULL;
self->pers_func_self = NULL;
self->dispatch_table = NULL;
self->buffer_callback = NULL;
self->reducer_override = NULL;
self->write = NULL;
self->output_buffer = output_buffer;
self->output_len = 0;
self->max_output_len = max_output_len;
self->proto = 0;
self->bin = 0;
self->framing = 0;
self->frame_start = -1;
self->buf_size = 0;
self->fast = 0;
self->fast_nesting = 0;
self->fix_imports = 0;
self->fast_memo = NULL;
self->max_output_len = WRITE_BUF_SIZE;
self->output_len = 0;
self->reducer_override = NULL;
self->memo = PyMemoTable_New();
if (self->memo == NULL) {
Py_DECREF(self);
return NULL;
}
self->output_buffer = PyBytes_FromStringAndSize(NULL,
self->max_output_len);
if (self->output_buffer == NULL) {
Py_DECREF(self);
return NULL;
}
self->buffer_callback = NULL;
PyObject_GC_Track(self);
return self;
error:
PyMem_Free(memo);
Py_XDECREF(output_buffer);
return NULL;
}
static int
@ -1602,13 +1609,29 @@ _Unpickler_MemoCleanup(UnpicklerObject *self)
static UnpicklerObject *
_Unpickler_New(void)
{
UnpicklerObject *self;
self = PyObject_GC_New(UnpicklerObject, &Unpickler_Type);
if (self == NULL)
const int MEMO_SIZE = 32;
PyObject **memo = _Unpickler_NewMemo(MEMO_SIZE);
if (memo == NULL) {
return NULL;
}
PyObject *stack = Pdata_New();
if (stack == NULL) {
goto error;
}
UnpicklerObject *self = PyObject_GC_New(UnpicklerObject, &Unpickler_Type);
if (self == NULL) {
goto error;
}
self->stack = (Pdata *)stack;
self->memo = memo;
self->memo_size = MEMO_SIZE;
self->memo_len = 0;
self->pers_func = NULL;
self->pers_func_self = NULL;
memset(&self->buffer, 0, sizeof(Py_buffer));
self->input_buffer = NULL;
self->input_line = NULL;
self->input_len = 0;
@ -1626,22 +1649,14 @@ _Unpickler_New(void)
self->marks_size = 0;
self->proto = 0;
self->fix_imports = 0;
memset(&self->buffer, 0, sizeof(Py_buffer));
self->memo_size = 32;
self->memo_len = 0;
self->memo = _Unpickler_NewMemo(self->memo_size);
if (self->memo == NULL) {
Py_DECREF(self);
return NULL;
}
self->stack = (Pdata *)Pdata_New();
if (self->stack == NULL) {
Py_DECREF(self);
return NULL;
}
PyObject_GC_Track(self);
return self;
error:
PyMem_Free(memo);
Py_XDECREF(stack);
return NULL;
}
/* Returns -1 (with an exception set) on failure, 0 on success. This may