Skip to content

gh-78274: Produce consistent output from marshal.dumps(). #28379

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

Closed
ericsnowcurrently wants to merge 8 commits into from
Closed

gh-78274: Produce consistent output from marshal.dumps(). #28379

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
167f426
hashtable -> ref_indices.
ericsnowcurrently Sep 16, 2021
549db47
Use a second pass to exclude refs for objects used only once.
ericsnowcurrently Sep 16, 2021
725001b
Add a NEWS entry.
ericsnowcurrently Sep 16, 2021
890b2f9
ref_indices -> hashtable.
ericsnowcurrently Sep 16, 2021
2aa38f6
Use Py_ssize_t.
ericsnowcurrently Sep 16, 2021
b506b45
Make the two-pass solution optional.
ericsnowcurrently Sep 16, 2021
8f9ba8d
Just use int for bool.
ericsnowcurrently Sep 16, 2021
27ad075
Change the BPO number.
ericsnowcurrently Sep 16, 2021
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
Prev Previous commit
Next Next commit
ref_indices -> hashtable.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Sep 16, 2021
commit 890b2f93dc1b02327b13a49355a3edd6e70a6885
20 changes: 10 additions & 10 deletions Python/marshal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ typedef struct {
char *ptr;
const char *end;
char *buf;
_Py_hashtable_t *ref_indices;
_Py_hashtable_t *hashtable;
ssize_t refs_numobjects;
int version;
} WFILE;
Expand Down Expand Up @@ -298,14 +298,14 @@ w_ref(PyObject *v, char *flag, WFILE *p)
_Py_hashtable_entry_t *entry;
int w;

if (p->version < 3 || p->ref_indices == NULL)
if (p->version < 3 || p->hashtable == NULL)
return 0; /* not writing object references */

/* if it has only one reference, it definitely isn't shared */
if (Py_REFCNT(v) == 1)
return 0;

entry = _Py_hashtable_get_entry(p->ref_indices, v);
entry = _Py_hashtable_get_entry(p->hashtable, v);
if (entry != NULL) {
w = (int)(uintptr_t)entry->value;
if (p->refs_numobjects < 0) {
Expand Down Expand Up @@ -357,7 +357,7 @@ w_ref(PyObject *v, char *flag, WFILE *p)
p->refs_numobjects += 1;
}
Py_INCREF(v);
if (_Py_hashtable_set(p->ref_indices, v, (void *)(uintptr_t)w) < 0) {
if (_Py_hashtable_set(p->hashtable, v, (void *)(uintptr_t)w) < 0) {
Py_DECREF(v);
p->error = WFERR_UNMARSHALLABLE;
return 1;
Expand Down Expand Up @@ -627,10 +627,10 @@ static int
w_init_refs(WFILE *wf, int version)
{
if (version >= 3) {
wf->ref_indices = _Py_hashtable_new_full(_Py_hashtable_hash_ptr,
_Py_hashtable_compare_direct,
w_decref_entry, NULL, NULL);
if (wf->ref_indices == NULL) {
wf->hashtable = _Py_hashtable_new_full(_Py_hashtable_hash_ptr,
_Py_hashtable_compare_direct,
w_decref_entry, NULL, NULL);
if (wf->hashtable == NULL) {
PyErr_NoMemory();
return -1;
}
Expand All @@ -641,8 +641,8 @@ w_init_refs(WFILE *wf, int version)
static void
w_clear_refs(WFILE *wf)
{
if (wf->ref_indices != NULL) {
_Py_hashtable_destroy(wf->ref_indices);
if (wf->hashtable != NULL) {
_Py_hashtable_destroy(wf->hashtable);
}
}

Expand Down