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

Fix exceptional cases in DCB dcb_call_callback and in MySQL backend gw_error_backend_event - close DCB and return.

Browse Source
This commit is contained in:
Martin Brampton
2015-09-24 07:39:47 +01:00
parent 95a4daecc9
commit 89667294b3
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/core/dcb.c
View File

@ -2672,6 +2672,11 @@ dcb_call_callback(DCB *dcb, DCB_REASON reason)
{
DCB_CALLBACK *cb, *nextcb;
if (NULL == dcb->session->router_session)
{
dcb_close(dcb);
return;
}
spinlock_acquire(&dcb->cb_lock);
cb = dcb->callbacks;
while (cb)

5
server/modules/protocol/mysql_backend.c
View File

@ -828,6 +828,11 @@ static int gw_error_backend_event(DCB *dcb)
CHK_DCB(dcb);
session = dcb->session;
CHK_SESSION(session);
if (SESSION_STATE_DUMMY == session->state)
{
dcb_close(dcb);
return 1;
}
rsession = session->router_session;
router = session->service->router;
router_instance = session->service->router_instance;