From: Christian Heimes Date: Fri, 15 Sep 2017 18:27:23 +0000 (+0200) Subject: bpo-31474: Fix -Wint-in-bool-context warnings (#3581) X-Git-Tag: v2.7.15rc1~199 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd39e2a6845f33a74fbb0671c434c0d84a5ec2f3;p=python bpo-31474: Fix -Wint-in-bool-context warnings (#3581) Signed-off-by: Christian Heimes --- diff --git a/Include/pymem.h b/Include/pymem.h index 10b5bea5eb..2c239df590 100644 --- a/Include/pymem.h +++ b/Include/pymem.h @@ -72,9 +72,9 @@ PyAPI_FUNC(void) PyMem_Free(void *); /* Returns NULL to indicate error if a negative size or size larger than Py_ssize_t can represent is supplied. Helps prevents security holes. */ #define PyMem_MALLOC(n) ((size_t)(n) > (size_t)PY_SSIZE_T_MAX ? NULL \ - : malloc((n) ? (n) : 1)) + : malloc(((n) != 0) ? (n) : 1)) #define PyMem_REALLOC(p, n) ((size_t)(n) > (size_t)PY_SSIZE_T_MAX ? NULL \ - : realloc((p), (n) ? (n) : 1)) + : realloc((p), ((n) != 0) ? (n) : 1)) #define PyMem_FREE free #endif /* PYMALLOC_DEBUG */ diff --git a/Misc/NEWS.d/next/Build/2017-09-14-19-38-19.bpo-31474.0s_mpD.rst b/Misc/NEWS.d/next/Build/2017-09-14-19-38-19.bpo-31474.0s_mpD.rst new file mode 100644 index 0000000000..41505aa4f7 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-09-14-19-38-19.bpo-31474.0s_mpD.rst @@ -0,0 +1 @@ +Fix -Wint-in-bool-context warnings in PyMem_MALLOC and PyMem_REALLOC macros