summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-07-07 15:07:52 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-07-07 15:07:52 (GMT)
commit11ebff2757517f6edf8c4b35d6c77b7052295acb (patch)
tree647567f1acc774ec78c1757043738cddbd52c589 /Modules
parent5064a52bcb59fd3ea56e5f57502946eb87eeaf14 (diff)
downloadcpython-11ebff2757517f6edf8c4b35d6c77b7052295acb.zip
cpython-11ebff2757517f6edf8c4b35d6c77b7052295acb.tar.gz
cpython-11ebff2757517f6edf8c4b35d6c77b7052295acb.tar.bz2
Issue #18203: Replace malloc() with PyMem_Malloc() in _ssl for the password
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_ssl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index ff3ef9e..4e619b8 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2070,8 +2070,8 @@ _pwinfo_set(_PySSLPasswordInfo *pw_info, PyObject* password,
goto error;
}
- free(pw_info->password);
- pw_info->password = malloc(size);
+ PyMem_Free(pw_info->password);
+ pw_info->password = PyMem_Malloc(size);
if (!pw_info->password) {
PyErr_SetString(PyExc_MemoryError,
"unable to allocate password buffer");
@@ -2215,13 +2215,13 @@ load_cert_chain(PySSLContext *self, PyObject *args, PyObject *kwds)
}
SSL_CTX_set_default_passwd_cb(self->ctx, orig_passwd_cb);
SSL_CTX_set_default_passwd_cb_userdata(self->ctx, orig_passwd_userdata);
- free(pw_info.password);
+ PyMem_Free(pw_info.password);
Py_RETURN_NONE;
error:
SSL_CTX_set_default_passwd_cb(self->ctx, orig_passwd_cb);
SSL_CTX_set_default_passwd_cb_userdata(self->ctx, orig_passwd_userdata);
- free(pw_info.password);
+ PyMem_Free(pw_info.password);
Py_XDECREF(keyfile_bytes);
Py_XDECREF(certfile_bytes);
return NULL;