commit 322cc7438c081e19d0402f53e720d6b0cd58b227
author Victor Stinner <victor.stinner@gmail.com> Sun Apr 14 18:11:41 2013 +0200
committer Victor Stinner <victor.stinner@gmail.com> Sun Apr 14 18:11:41 2013 +0200
tree 296b29b7a30d1224f960d0ea1681041aedfe50a9
parent bf71f7d654244bbc9a089e3f539fa78d283e2010

Issue #17693: Fix memory/reference leaks

Modules/cjkcodecs/multibytecodec.c

diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 5a916fd..4c865ec 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -738,7 +738,6 @@
     PyObject *inbuf = NULL;
     Py_ssize_t inpos, datalen;
     PyObject *origpending = NULL;
-    wchar_t *data;
 
     if (PyUnicode_Check(unistr))
         ucvt = NULL;
@@ -754,10 +753,6 @@
         }
     }
 
-    data = PyUnicode_AsUnicodeAndSize(unistr, &datalen);
-    if (data == NULL)
-        goto errorexit;
-
     if (ctx->pending) {
         PyObject *inbuf_tmp;
 
@@ -793,6 +788,7 @@
         origpending = NULL;
         goto errorexit;
     }
+    Py_XDECREF(origpending);
 
     if (inpos < datalen) {
         if (datalen - inpos > MAXENCPENDING) {
@@ -808,6 +804,7 @@
         }
     }
 
+    Py_DECREF(inbuf);
     Py_XDECREF(ucvt);
     return r;
 
@@ -815,6 +812,7 @@
     Py_XDECREF(r);
     Py_XDECREF(ucvt);
     Py_XDECREF(origpending);
+    Py_XDECREF(inbuf);
     return NULL;
 }