mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-22 18:55:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

bpo-37596: Make set and frozenset marshalling deterministic (GH-27926)

Browse source
This commit is contained in:
Brandt Bucher 2021-08-25 04:14:34 -07:00 • committed by GitHub
parent 7ecd3425d4
commit 33d95c6fac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 59 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Python/marshal.c
View file

@ -503,9 +503,41 @@ w_complex_object(PyObject *v, char flag, WFILE *p)
W_TYPE(TYPE_SET, p);
n = PySet_GET_SIZE(v);
W_SIZE(n, p);
// bpo-37596: To support reproducible builds, sets and frozensets need
// 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);
if (pairs == NULL) {
p->error = WFERR_NOMEMORY;
return;
}
while (_PySet_NextEntry(v, &pos, &value, &hash)) {
PyObject *dump = PyMarshal_WriteObjectToString(value, p->version);
if (dump == NULL) {
p->error = WFERR_UNMARSHALLABLE;
goto anyset_done;
}
PyObject *pair = PyTuple_Pack(2, dump, value);
Py_DECREF(dump);
if (pair == NULL || PyList_Append(pairs, pair)) {
p->error = WFERR_NOMEMORY;
Py_XDECREF(pair);
goto anyset_done;
}
Py_DECREF(pair);
}
if (PyList_Sort(pairs)) {
p->error = WFERR_NOMEMORY;
goto anyset_done;
}
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)) {
PyCodeObject *co = (PyCodeObject *)v;