From 04d09ebd396d2a87ad7204e170c1149edc9b141d Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 30 Mar 2015 09:58:41 +0300
Subject: Issue #23785: Fixed memory leak in TextIOWrapper.tell() in rare
 circumstances.

---
 Modules/_io/textio.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 3f01980..d1c0d01 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -2435,14 +2435,10 @@ fail:
     if (saved_state) {
         PyObject *type, *value, *traceback;
         PyErr_Fetch(&type, &value, &traceback);
-
         res = _PyObject_CallMethodId(self->decoder, &PyId_setstate, "(O)", saved_state);
+        _PyErr_ChainExceptions(type, value, traceback);
         Py_DECREF(saved_state);
-        if (res == NULL)
-            return NULL;
-        Py_DECREF(res);
-
-        PyErr_Restore(type, value, traceback);
+        Py_XDECREF(res);
     }
     return NULL;
 }
-- 
cgit v0.12