commit 2e1c4e5db2894ec4322f917e9babc4e37dca9244
author Serhiy Storchaka <storchaka@gmail.com> Mon Mar 30 10:00:40 2015 +0300
committer Serhiy Storchaka <storchaka@gmail.com> Mon Mar 30 10:00:40 2015 +0300
tree 2afb6e263a642e4c17f7dee46f5787728c5c5f47
parent be1c60c3f68a0ec75727fda4811a6eeae3f19048
parent 04d09ebd396d2a87ad7204e170c1149edc9b141d

Issue #23785: Fixed memory leak in TextIOWrapper.tell() in rare circumstances.

Modules/_io/textio.c

diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 9fb4ef9..af232bf 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -2441,14 +2441,10 @@
     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;
 }