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

serhiy-storchaka · serhiy-storchaka · commit 04d09ebd396d · 2015-03-30T09:58:41.000+03:00
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
@@ -2435,14 +2435,10 @@ textiowrapper_tell(textio *self, PyObject *args)
     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;
 }
