mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 08:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-28503: Use crypt_r() when available instead of crypt() (GH-11373)

Browse source 
Use crypt_r() when available instead of crypt() in the crypt module.

As a nice side effect: This also avoids a memory sanitizer flake as clang msan doesn't know about crypt's internal libc allocated buffer.
This commit is contained in:
Gregory P. Smith 2018-12-30 15:42:32 -08:00 • committed by GitHub
parent 1b29c03c95
commit 387512c7ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 185 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/_cryptmodule.c
View file

@ -34,7 +34,15 @@ static PyObject *
crypt_crypt_impl(PyObject *module, const char *word, const char *salt)
/*[clinic end generated code: output=0512284a03d2803c input=0e8edec9c364352b]*/
{
return Py_BuildValue("s", crypt(word, salt));
char *crypt_result;
#ifdef HAVE_CRYPT_R
struct crypt_data data;
memset(&data, 0, sizeof(data));
crypt_result = crypt_r(word, salt, &data);
#else
crypt_result = crypt(word, salt);
#endif
return Py_BuildValue("s", crypt_result);
}