Skip to content

gh-105375: Improve _pickle error handling #105475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 9, 2023
Merged

gh-105375: Improve _pickle error handling #105475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b514d5
gh-105375: Improve _pickle error handling
erlend-aasland Jun 7, 2023
a91713a
Bail early from _Unpickler_SetInputStream() also
erlend-aasland Jun 7, 2023
32ef468
Revert "Bail early from _Unpickler_SetInputStream() also"
erlend-aasland Jun 8, 2023
7d6821a
Add NEWS
erlend-aasland Jun 8, 2023
e8f324f
Pull in main
erlend-aasland Jun 8, 2023
e9b7ebd
Pull in main
erlend-aasland Jun 9, 2023
f6e7be7
Add back decrefs
erlend-aasland Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2023-06-08-08-58-36.gh-issue-105375.bTcqS9.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix bugs in :mod:`pickle` where exceptions could be overwritten.
39 changes: 27 additions & 12 deletions Modules/_pickle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,10 +1168,13 @@ _Pickler_New(PickleState *st)
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->memo == NULL || self->output_buffer == NULL) {
if (self->output_buffer == NULL) {
Py_DECREF(self);
return NULL;
}
Expand Down Expand Up @@ -1654,9 +1657,12 @@ _Unpickler_New(PyObject *module)
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(st);

if (self->memo == NULL || self->stack == NULL) {
if (self->stack == NULL) {
Py_DECREF(self);
return NULL;
}
Expand Down Expand Up @@ -4828,11 +4834,12 @@ _pickle_PicklerMemoProxy_copy_impl(PicklerMemoProxyObject *self)
PyObject *key, *value;

key = PyLong_FromVoidPtr(entry.me_key);
if (key == NULL) {
goto error;
}
value = Py_BuildValue("nO", entry.me_value, entry.me_key);

if (key == NULL || value == NULL) {
Py_XDECREF(key);
Py_XDECREF(value);
if (value == NULL) {
Py_DECREF(key);
goto error;
}
status = PyDict_SetItem(new_memo, key, value);
Expand Down Expand Up @@ -5988,12 +5995,20 @@ load_stack_global(PickleState *st, UnpicklerObject *self)
PyObject *global_name;

PDATA_POP(st, self->stack, global_name);
if (global_name == NULL) {
return -1;
}
PDATA_POP(st, self->stack, module_name);
if (module_name == NULL || !PyUnicode_CheckExact(module_name) ||
global_name == NULL || !PyUnicode_CheckExact(global_name)) {
if (module_name == NULL) {
Py_DECREF(global_name);
return -1;
}
if (!PyUnicode_CheckExact(module_name) ||
!PyUnicode_CheckExact(global_name))
{
PyErr_SetString(st->UnpicklingError, "STACK_GLOBAL requires str");
Py_XDECREF(global_name);
Py_XDECREF(module_name);
Py_DECREF(global_name);
Py_DECREF(module_name);
return -1;
}
global = find_class(self, module_name, global_name);
Expand Down