bpo-40121: Fixes audit event raised on creating a new socket (GH-19238)

This commit is contained in:
Steve Dower 2020-03-31 12:38:53 +01:00 committed by GitHub
parent ef67512b40
commit 63ba5cccf4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 3 deletions

View file

@ -5099,7 +5099,7 @@ sock_initobj(PyObject *self, PyObject *args, PyObject *kwds)
#ifdef MS_WINDOWS
/* In this case, we don't use the family, type and proto args */
if (fdobj != NULL && fdobj != Py_None)
if (fdobj == NULL || fdobj == Py_None)
#endif
{
if (PySys_Audit("socket.__new__", "Oiii",
@ -5121,8 +5121,9 @@ sock_initobj(PyObject *self, PyObject *args, PyObject *kwds)
}
memcpy(&info, PyBytes_AS_STRING(fdobj), sizeof(info));
if (PySys_Audit("socket()", "iii", info.iAddressFamily,
info.iSocketType, info.iProtocol) < 0) {
if (PySys_Audit("socket.__new__", "Oiii", s,
info.iAddressFamily, info.iSocketType,
info.iProtocol) < 0) {
return -1;
}