diff options
| author | Yury Selivanov <yury@magic.io> | 2018-07-06 16:20:07 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-06 16:20:07 (GMT) |
| commit | 0b75228700e0077d8bf2636e74733389514b4b2f (patch) | |
| tree | 71286b01828ff373515ab058c9d7640b9e19eb5e | |
| parent | dc9bc548994066897ca4edfdbf36ea9272bfdee9 (diff) | |
| download | cpython-0b75228700e0077d8bf2636e74733389514b4b2f.zip cpython-0b75228700e0077d8bf2636e74733389514b4b2f.tar.gz cpython-0b75228700e0077d8bf2636e74733389514b4b2f.tar.bz2 | |
bpo-34042: Fix dict.copy() to maintain correct total refcount (GH-8119)
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2018-07-05-15-51-29.bpo-34042.Gr9XUH.rst | 2 | ||||
| -rw-r--r-- | Objects/dictobject.c | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-07-05-15-51-29.bpo-34042.Gr9XUH.rst b/Misc/NEWS.d/next/Core and Builtins/2018-07-05-15-51-29.bpo-34042.Gr9XUH.rst new file mode 100644 index 0000000..fd1730d --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-07-05-15-51-29.bpo-34042.Gr9XUH.rst @@ -0,0 +1,2 @@ +Fix dict.copy() to maintain correct total refcount (as reported by +sys.gettotalrefcount()). diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 40d7d8a..413557d 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -656,6 +656,13 @@ clone_combined_dict(PyDictObject *orig) /* Maintain tracking. */ _PyObject_GC_TRACK(new); } + + /* Since we copied the keys table we now have an extra reference + in the system. Manually call _Py_INC_REFTOTAL to signal that + we have it now; calling DK_INCREF would be an error as + keys->dk_refcnt is already set to 1 (after memcpy). */ + _Py_INC_REFTOTAL; + return (PyObject *)new; } |