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

Added missing check for closed master backend reference into readwritesplit

Browse Source 
The master DCB was checked for NULL-ness but the proper way is to check if
the backend reference is closed. This will fix a debug assertion in addition
to possibly preventing crashes.
This commit is contained in:
Markus Makela
2016-02-02 21:17:45 +02:00
parent e7fb2640d3
commit d9eeb72198
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -2049,7 +2049,8 @@ static bool route_single_stmt(
* Read stored master DCB pointer. If master is not set, routing must * Read stored master DCB pointer. If master is not set, routing must
* be aborted * be aborted
*/ */
if ((master_dcb = rses->rses_master_ref->bref_dcb) == NULL) if ((master_dcb = rses->rses_master_ref->bref_dcb) == NULL ||
BREF_IS_CLOSED(rses->rses_master_ref))
{ {
char* query_str = modutil_get_query(querybuf); char* query_str = modutil_get_query(querybuf);
MXS_ERROR("Can't route %s:%s:\"%s\" to " MXS_ERROR("Can't route %s:%s:\"%s\" to "
@ -2060,6 +2061,10 @@ static bool route_single_stmt(
(query_str == NULL ? "(empty)" : query_str)); (query_str == NULL ? "(empty)" : query_str));
free(query_str); free(query_str);
succp = false; succp = false;
while(querybuf)
{
querybuf = GWBUF_CONSUME_ALL(querybuf);
}
goto retblock; goto retblock;
} }