PyOS_vsnprintf(): Change PyMem_Malloc() call to PyMem_MALLOC() macro,

(ditto for PyMem_Free() -> PyMem_FREE()) to fix and close SF bug
#495875 on systems that HAVE_SNPRINTF=0.

Check in on both release-22 branch and trunk.

diff --git a/Python/mysnprintf.c b/Python/mysnprintf.c
index e3b72de2bf007193559da1b53c88d51d36486c1b..4d3770d894359b14a78680051cf58c78bdfe8972 100644 (file)
--- a/Python/mysnprintf.c
+++ b/Python/mysnprintf.c
@@ -65,7 +65,7 @@ PyOS_vsnprintf(char *str, size_t size, const char  *format, va_list va)
        len = vsnprintf(str, size, format, va);
 #else
        /* Emulate it. */
-       buffer = PyMem_Malloc(size + 512);
+       buffer = PyMem_MALLOC(size + 512);
        if (buffer == NULL) {
                len = -666;
                goto Done;
@@ -85,7 +85,7 @@ PyOS_vsnprintf(char *str, size_t size, const char  *format, va_list va)
                memcpy(str, buffer, to_copy);
                str[to_copy] = '\0';
        }
-       PyMem_Free(buffer);
+       PyMem_FREE(buffer);
 Done:
 #endif
        str[size-1] = '\0';