mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-37596: Clean up the set/frozenset marshalling code (GH-28068)

Browse source
This commit is contained in:
Brandt Bucher 2021-08-31 09:18:33 -07:00 • committed by GitHub
parent 4300352000
commit 51999c960e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Python/marshal.c
View file

@ -507,36 +507,39 @@ w_complex_object(PyObject *v, char flag, WFILE *p)
// to have their elements serialized in a consistent order (even when
// they have been scrambled by hash randomization). To ensure this, we
// use an order equivalent to sorted(v, key=marshal.dumps):
PyObject *pairs = PyList_New(0);
PyObject *pairs = PyList_New(n);
if (pairs == NULL) {
p->error = WFERR_NOMEMORY;
return;
}
Py_ssize_t i = 0;
while (_PySet_NextEntry(v, &pos, &value, &hash)) {
PyObject *dump = PyMarshal_WriteObjectToString(value, p->version);
if (dump == NULL) {
p->error = WFERR_UNMARSHALLABLE;
goto anyset_done;
Py_DECREF(pairs);
return;
}
PyObject *pair = PyTuple_Pack(2, dump, value);
Py_DECREF(dump);
if (pair == NULL || PyList_Append(pairs, pair)) {
if (pair == NULL) {
p->error = WFERR_NOMEMORY;
Py_XDECREF(pair);
goto anyset_done;
Py_DECREF(pairs);
return;
}
Py_DECREF(pair);
PyList_SET_ITEM(pairs, i++, pair);
}
assert(i == n);
if (PyList_Sort(pairs)) {
p->error = WFERR_NOMEMORY;
goto anyset_done;
Py_DECREF(pairs);
return;
}
for (Py_ssize_t i = 0; i < n; i++) {
PyObject *pair = PyList_GET_ITEM(pairs, i);
value = PyTuple_GET_ITEM(pair, 1);
w_object(value, p);
}
anyset_done:
Py_DECREF(pairs);
}
else if (PyCode_Check(v)) {