From: Christian Heimes <christian@cheimes.de>
Date: Sun, 21 Jul 2013 14:24:51 +0000 (+0200)
Subject: Issue #18514: Fix unreachable Py_DECREF() call in PyCData_FromBaseObj()
X-Git-Tag: v3.4.0a1~116^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c4c1f6e669453165a31e03b131f089ae1271067;p=thirdparty%2FPython%2Fcpython.git

Issue #18514: Fix unreachable Py_DECREF() call in PyCData_FromBaseObj()
---

diff --git a/Misc/NEWS b/Misc/NEWS
index f79f62584aa8..3b45833439e5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -49,6 +49,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #18514: Fix unreachable Py_DECREF() call in PyCData_FromBaseObj()
+
 - Issue #18513: Fix behaviour of cmath.rect w.r.t. signed zeros on OS X 10.8 +
   gcc.
 
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index c1956945c9de..a025a732f6d0 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -2671,8 +2671,8 @@ PyCData_FromBaseObj(PyObject *type, PyObject *base, Py_ssize_t index, char *adr)
         cmem->b_index = index;
     } else { /* copy contents of adr */
         if (-1 == PyCData_MallocBuffer(cmem, dict)) {
-            return NULL;
             Py_DECREF(cmem);
+            return NULL;
         }
         memcpy(cmem->b_ptr, adr, dict->size);
         cmem->b_index = index;