mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-14 10:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #25725: Fixed a reference leak in pickle.loads() when unpickling

Browse source 
invalid data including tuple instructions.
This commit is contained in:
Serhiy Storchaka 2015-11-25 15:01:53 +02:00
parent 4f44d53770
commit a49de6be36
2 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -106,6 +106,9 @@ Core and Builtins
Library Library
------- -------
- Issue #25725: Fixed a reference leak in pickle.loads() when unpickling
invalid data including tuple instructions.
- Issue #25663: In the Readline completer, avoid listing duplicate global - Issue #25663: In the Readline completer, avoid listing duplicate global
names, and search the global namespace before searching builtins. names, and search the global namespace before searching builtins.

27
Modules/_pickle.c
View file

@ -4915,15 +4915,14 @@ load_counted_binunicode(UnpicklerObject *self, int nbytes)
} }
static int static int
load_tuple(UnpicklerObject *self) load_counted_tuple(UnpicklerObject *self, int len)
{ {
PyObject *tuple; PyObject *tuple;
Py_ssize_t i;
if ((i = marker(self)) < 0) if (Py_SIZE(self->stack) < len)
return -1; return stack_underflow();
tuple = Pdata_poptuple(self->stack, i); tuple = Pdata_poptuple(self->stack, Py_SIZE(self->stack) - len);
if (tuple == NULL) if (tuple == NULL)
return -1; return -1;
PDATA_PUSH(self->stack, tuple, -1); PDATA_PUSH(self->stack, tuple, -1);
@ -4931,24 +4930,14 @@ load_tuple(UnpicklerObject *self)
} }
static int static int
load_counted_tuple(UnpicklerObject *self, int len) load_tuple(UnpicklerObject *self)
{ {
PyObject *tuple; Py_ssize_t i;
tuple = PyTuple_New(len); if ((i = marker(self)) < 0)
if (tuple == NULL)
return -1; return -1;
while (--len >= 0) { return load_counted_tuple(self, Py_SIZE(self->stack) - i);
PyObject *item;
PDATA_POP(self->stack, item);
if (item == NULL)
return -1;
PyTuple_SET_ITEM(tuple, len, item);
}
PDATA_PUSH(self->stack, tuple, -1);
return 0;
} }
static int static int