From c71d24f55828e7f0f2c8750d2e1b04d04539beff Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Sat, 27 Feb 2021 20:31:03 +0900
Subject: bpo-43321: Fix SystemError in getargs.c (GH-24656)

---
 Python/getargs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Python/getargs.c')

diff --git a/Python/getargs.c b/Python/getargs.c
index 936eb6a89a3..b85b575a147 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -655,14 +655,14 @@ static const char *
 convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
               char *msgbuf, size_t bufsize, freelist_t *freelist)
 {
+#define RETURN_ERR_OCCURRED return msgbuf
     /* For # codes */
 #define REQUIRE_PY_SSIZE_T_CLEAN \
     if (!(flags & FLAG_SIZE_T)) { \
         PyErr_SetString(PyExc_SystemError, \
                         "PY_SSIZE_T_CLEAN macro must be defined for '#' formats"); \
-        return NULL; \
+        RETURN_ERR_OCCURRED; \
     }
-#define RETURN_ERR_OCCURRED return msgbuf
 
     const char *format = *p_format;
     char c = *format++;
-- 
cgit v1.2.3