hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix invalid read

Browse Source 
A returned object will be destructed at the next sequence point.
This commit is contained in:
Johan Wikman
2019-01-07 16:04:47 +02:00
parent f8545a0b7f
commit ade66816f1
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/core/dcb.cc
View File

@ -366,14 +366,24 @@ DCB* dcb_connect(SERVER* srv, MXS_SESSION* session, const char* protocol)
dcb->remote = MXS_STRDUP_A(session->client_dcb->remote); dcb->remote = MXS_STRDUP_A(session->client_dcb->remote);
} }
const char* authenticator = !server->get_authenticator().empty() ? server->get_authenticator().c_str() : string authenticator = server->get_authenticator();
(dcb->func.auth_default ? dcb->func.auth_default() : "NullAuthDeny"); if (authenticator.empty())
{
if (dcb->func.auth_default)
{
authenticator = dcb->func.auth_default();
}
else
{
authenticator = "NullAuthDeny";
}
}
MXS_AUTHENTICATOR* authfuncs = (MXS_AUTHENTICATOR*)load_module(authenticator, MXS_AUTHENTICATOR* authfuncs = (MXS_AUTHENTICATOR*)load_module(authenticator.c_str(),
MODULE_AUTHENTICATOR); MODULE_AUTHENTICATOR);
if (authfuncs == NULL) if (authfuncs == NULL)
{ {
MXS_ERROR("Failed to load authenticator module '%s'", authenticator); MXS_ERROR("Failed to load authenticator module '%s'", authenticator.c_str());
dcb_free_all_memory(dcb); dcb_free_all_memory(dcb);
return NULL; return NULL;
} }