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

MXS-1033: Fix crash on 'maxadmin list clients'

Browse Source 
When the client connections were listed, the DCB state was not
inspected. Only DCBs in the polling state should be printed as they are
guaranteed to be in a valid state.
This commit is contained in:
Markus Makela
2016-11-30 23:10:24 +02:00
parent 82ef1a9149
commit ac0f975f9c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/core/dcb.c
View File

@ -2157,7 +2157,7 @@ dListDCBs(DCB *pdcb)
dcb_printf(pdcb, "------------------+----------------------------+--------------------+----------\n"); dcb_printf(pdcb, "------------------+----------------------------+--------------------+----------\n");
while (dcb) while (dcb)
{ {
if (dcb->dcb_is_in_use) if (dcb->dcb_is_in_use && dcb->state == DCB_STATE_POLLING)
{ {
dcb_printf(pdcb, " %-16p | %-26s | %-18s | %s\n", dcb_printf(pdcb, " %-16p | %-26s | %-18s | %s\n",
dcb, gw_dcb_state2string(dcb->state), dcb, gw_dcb_state2string(dcb->state),
@ -2189,7 +2189,8 @@ dListClients(DCB *pdcb)
dcb_printf(pdcb, "-----------------+------------------+----------------------+------------\n"); dcb_printf(pdcb, "-----------------+------------------+----------------------+------------\n");
while (dcb) while (dcb)
{ {
if (dcb->dcb_is_in_use && dcb->dcb_role == DCB_ROLE_CLIENT_HANDLER) if (dcb->dcb_is_in_use && dcb->dcb_role == DCB_ROLE_CLIENT_HANDLER &&
dcb->state == DCB_STATE_POLLING)
{ {
dcb_printf(pdcb, " %-15s | %16p | %-20s | %10p\n", dcb_printf(pdcb, " %-15s | %16p | %-20s | %10p\n",
(dcb->remote ? dcb->remote : ""), (dcb->remote ? dcb->remote : ""),