From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 29 Oct 2013 02:50:45 +0000 (+0100)
Subject: Issue #18408: Fix PyCStructUnionType_update_stgdict(), handle
X-Git-Tag: v3.4.0b1~486
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd371b92c43a98d0df31cd36ed19cf0bb2f94143;p=thirdparty%2FPython%2Fcpython.git

Issue #18408: Fix PyCStructUnionType_update_stgdict(), handle
_ctypes_alloc_format_string() failure
---

diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c
index 25d999626a1c..b95b0a423178 100644
--- a/Modules/_ctypes/stgdict.c
+++ b/Modules/_ctypes/stgdict.c
@@ -417,6 +417,8 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct
            that). Use 'B' for bytes. */
         stgdict->format = _ctypes_alloc_format_string(NULL, "B");
     }
+    if (stgdict->format == NULL)
+        return -1;
 
 #define realdict ((PyObject *)&stgdict->dict)
     for (i = 0; i < len; ++i) {
@@ -483,7 +485,7 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct
             char *fieldfmt = dict->format ? dict->format : "B";
             char *fieldname = _PyUnicode_AsString(name);
             char *ptr;
-            Py_ssize_t len; 
+            Py_ssize_t len;
             char *buf;
 
             if (fieldname == NULL)