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

Fix file descriptor assertions

Browse Source 
Zero is a valid file descriptor and no negative values other than -1 are
ever stored in the DCB::fd member.
This commit is contained in:
Markus Mäkelä
2018-12-07 11:27:30 +02:00
parent ae62cf6eb6
commit a40e2f94f3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
View File

@ -196,7 +196,7 @@ static int gw_create_backend_connection(DCB* backend_dcb,
switch (rv)
{
case 0:
mxb_assert(fd > 0);
mxb_assert(fd != DCBFD_CLOSED);
protocol->fd = fd;
protocol->protocol_auth_state = MXS_AUTH_STATE_CONNECTED;
MXS_DEBUG("Established "
@ -219,7 +219,7 @@ static int gw_create_backend_connection(DCB* backend_dcb,
* as it means the calls have been successful but the connection
* has not yet completed and the calls are non-blocking.
*/
mxb_assert(fd > 0);
mxb_assert(fd != DCBFD_CLOSED);
protocol->protocol_auth_state = MXS_AUTH_STATE_PENDING_CONNECT;
protocol->fd = fd;
MXS_DEBUG("Connection "