mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-15 21:26:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-43321: Fix SystemError in getargs.c (GH-24656)

Browse source
This commit is contained in:
Inada Naoki 2021-02-27 20:31:03 +09:00 • committed by GitHub
parent 145bf269df
commit c71d24f558
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Core and Builtins/2021-02-26-13-17-52.bpo-43321.TCS3ph.rst Normal file
View file

@ -0,0 +1,2 @@
Fix ``SystemError`` raised when ``PyArg_Parse*()`` is used with ``#`` but
without ``PY_SSIZE_T_CLEAN`` defined.

4
Python/getargs.c
View file

@ -655,14 +655,14 @@ static const char *
convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags, convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
char *msgbuf, size_t bufsize, freelist_t *freelist) char *msgbuf, size_t bufsize, freelist_t *freelist)
{ {
#define RETURN_ERR_OCCURRED return msgbuf
/* For # codes */ /* For # codes */
#define REQUIRE_PY_SSIZE_T_CLEAN \ #define REQUIRE_PY_SSIZE_T_CLEAN \
if (!(flags & FLAG_SIZE_T)) { \ if (!(flags & FLAG_SIZE_T)) { \
PyErr_SetString(PyExc_SystemError, \ PyErr_SetString(PyExc_SystemError, \
"PY_SSIZE_T_CLEAN macro must be defined for '#' formats"); \ "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; const char *format = *p_format;
char c = *format++; char c = *format++;