From c0f43606f8c82cc9511c51fa2a9d12d058fbb438 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 23 Sep 2023 13:09:04 +0300
Subject: [PATCH] gh-109786: Fix leaks when re-enter
 itertools.pairwise.__next__()

---
 Lib/test/test_itertools.py                    | 32 +++++++++++++++++++
 ...-09-23-14-40-51.gh-issue-109786.UX3pKv.rst |  2 ++
 Modules/itertoolsmodule.c                     | 10 ++++--
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2023-09-23-14-40-51.gh-issue-109786.UX3pKv.rst

diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py
index 512745e45350d1..8c2b9260350d58 100644
--- a/Lib/test/test_itertools.py
+++ b/Lib/test/test_itertools.py
@@ -1152,6 +1152,38 @@ def test_pairwise(self):
         with self.assertRaises(TypeError):
             pairwise(None)                                  # non-iterable argument
 
+    def test_pairwise_reenter(self):
+        def check(reenter_at, expected):
+            class I:
+                count = 0
+                def __iter__(self):
+                    return self
+                def __next__(self):
+                    self.count +=1
+                    if self.count == reenter_at:
+                        return next(it)
+                    return [self.count]  # new object
+
+            it = pairwise(I())
+            for item in expected:
+                self.assertEqual(next(it), item)
+
+        check(1, [
+            (([2], [3]), [4]),
+            ([4], [5]),
+        ])
+        check(2, [
+            ([1], ([3], [4])),
+            (([3], [4]), [5]),
+            ([5], [6]),
+        ])
+        check(3, [
+            ([1], [2]),
+            ([2], ([2], [4])),
+            (([2], [4]), [5]),
+            ([5], [6]),
+        ])
+
     def test_product(self):
         for args, result in [
             ([], [()]),                     # zero iterables
diff --git a/Misc/NEWS.d/next/Library/2023-09-23-14-40-51.gh-issue-109786.UX3pKv.rst b/Misc/NEWS.d/next/Library/2023-09-23-14-40-51.gh-issue-109786.UX3pKv.rst
new file mode 100644
index 00000000000000..fdd4a5534e4906
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-09-23-14-40-51.gh-issue-109786.UX3pKv.rst
@@ -0,0 +1,2 @@
+Fix reference leaks when re-enter the ``__next__()`` method of
+:class:`itertools.pairwise`.
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
index 4ed34aa5bde827..ddb8703dd3bf80 100644
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -330,21 +330,27 @@ pairwise_next(pairwiseobject *po)
         return NULL;
     }
     if (old == NULL) {
-        po->old = old = (*Py_TYPE(it)->tp_iternext)(it);
+        old = (*Py_TYPE(it)->tp_iternext)(it);
         if (old == NULL) {
             Py_CLEAR(po->it);
+            Py_CLEAR(po->old);
             return NULL;
         }
     }
+    else {
+        Py_INCREF(old);
+    }
     new = (*Py_TYPE(it)->tp_iternext)(it);
     if (new == NULL) {
         Py_CLEAR(po->it);
         Py_CLEAR(po->old);
+        Py_DECREF(old);
         return NULL;
     }
     /* Future optimization: Reuse the result tuple as we do in enumerate() */
     result = PyTuple_Pack(2, old, new);
-    Py_SETREF(po->old, new);
+    Py_XSETREF(po->old, new);
+    Py_DECREF(old);
     return result;
 }