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

Fix to prevent double free of dcb->data/session->data. If authentication fails, call free(dcb->data) only when DCB in question is *not* cloned.

Browse Source
This commit is contained in:
VilhoRaatikka
2014-12-30 12:28:36 +02:00
parent b0c152b55c
commit 77bd279a01
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/session.c
View File

@ -85,7 +85,7 @@ session_alloc(SERVICE *service, DCB *client_dcb)
"session object due error %d, %s.", "session object due error %d, %s.",
errno, errno,
strerror(errno)))); strerror(errno))));
if (client_dcb->data) if (client_dcb->data && !DCB_IS_CLONE(client_dcb))
{ {
free(client_dcb->data); free(client_dcb->data);
client_dcb->data = NULL; client_dcb->data = NULL;

7
server/modules/protocol/mysql_client.c
View File

@ -685,7 +685,7 @@ int gw_read_client_event(
dcb_close(dcb); dcb_close(dcb);
} }
} }
else else
{ {
char* fail_str = NULL; char* fail_str = NULL;
@ -721,7 +721,10 @@ int gw_read_client_event(
/** /**
* Release MYSQL_session since it is not used anymore. * Release MYSQL_session since it is not used anymore.
*/ */
free(dcb->data); if (!DCB_IS_CLONE(dcb))
{
free(dcb->data);
}
dcb->data = NULL; dcb->data = NULL;
dcb_close(dcb); dcb_close(dcb);