From d28bb624d120466ba5ebdf5063286b2f309283ab Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 25 Nov 2015 18:33:29 +0200
Subject: Issue #24097: Fixed crash in object.__reduce__() if slot name is
 freed inside __getattr__.  Original patch by Antoine Pitrou.

---
 Lib/test/test_descr.py | 17 +++++++++++++++++
 Misc/NEWS              |  3 +++
 Objects/typeobject.c   |  3 +++
 3 files changed, 23 insertions(+)

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index ce9626c..64a4a36 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4988,6 +4988,23 @@ class PicklingTests(unittest.TestCase):
                     objcopy2 = deepcopy(objcopy)
                     self._assert_is_copy(obj, objcopy2)
 
+    def test_issue24097(self):
+        # Slot name is freed inside __getattr__ and is later used.
+        class S(str):  # Not interned
+            pass
+        class A:
+            __slotnames__ = [S('spam')]
+            def __getattr__(self, attr):
+                if attr == 'spam':
+                    A.__slotnames__[:] = [S('spam')]
+                    return 42
+                else:
+                    raise AttributeError
+
+        import copyreg
+        expected = (copyreg.__newobj__, (A,), (None, {'spam': 42}), None, None)
+        self.assertEqual(A().__reduce__(2), expected)  # Shouldn't crash
+
 
 class SharedKeyTests(unittest.TestCase):
 
diff --git a/Misc/NEWS b/Misc/NEWS
index fa365cc..9dc0aae 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ Release date: tba
 Core and Builtins
 -----------------
 
+- Issue #24097: Fixed crash in object.__reduce__() if slot name is freed inside
+  __getattr__.
+
 - Issue #24731: Fixed crash on converting objects with special methods
   __bytes__, __trunc__, and __float__ returning instances of subclasses of
   bytes, int, and float to subclasses of bytes, int, and float correspondingly.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index b38e0fb..ca5355a 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3768,8 +3768,10 @@ _PyObject_GetState(PyObject *obj)
                 PyObject *name, *value;
 
                 name = PyList_GET_ITEM(slotnames, i);
+                Py_INCREF(name);
                 value = PyObject_GetAttr(obj, name);
                 if (value == NULL) {
+                    Py_DECREF(name);
                     if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
                         goto error;
                     }
@@ -3778,6 +3780,7 @@ _PyObject_GetState(PyObject *obj)
                 }
                 else {
                     int err = PyDict_SetItem(slots, name, value);
+                    Py_DECREF(name);
                     Py_DECREF(value);
                     if (err) {
                         goto error;
-- 
cgit v0.12