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

Cleanup of memory leak in the authentication code

Browse Source 
Remove duplicate code in mysql_client module
This commit is contained in:
Mark Riddoch
2013-06-24 17:28:58 +02:00
parent f4c1b298d6
commit c65d569ce7
1 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
modules/protocol/mysql_client.c
View File

@ -482,6 +482,8 @@ static int gw_mysql_do_authentication(DCB *dcb, GWBUF *queue) {
// decode the token and check the password // decode the token and check the password
auth_ret = gw_check_mysql_scramble_data(auth_token, auth_token_len, protocol->scramble, sizeof(protocol->scramble), username, stage1_hash); auth_ret = gw_check_mysql_scramble_data(auth_token, auth_token_len, protocol->scramble, sizeof(protocol->scramble), username, stage1_hash);
free(auth_token);
if (auth_ret == 0) { if (auth_ret == 0) {
fprintf(stderr, "<<< CLIENT AUTH is OK\n"); fprintf(stderr, "<<< CLIENT AUTH is OK\n");
} else { } else {
@ -864,41 +866,8 @@ int gw_write_client_event(DCB *dcb) {
if ((protocol->state == MYSQL_IDLE) || (protocol->state == MYSQL_WAITING_RESULT)) { if ((protocol->state == MYSQL_IDLE) || (protocol->state == MYSQL_WAITING_RESULT)) {
int w; int w;
int m;
int saved_errno = 0;
spinlock_acquire(&dcb->writeqlock); w = dcb_drain_writeq(dcb);
if (dcb->writeq)
{
int len;
/*
* Loop over the buffer chain in the pendign writeq
* Send as much of the data in that chain as possible and
* leave any balance on the write queue.
*/
while (dcb->writeq != NULL)
{
len = GWBUF_LENGTH(dcb->writeq);
GW_NOINTR_CALL(w = write(dcb->fd, GWBUF_DATA(dcb->writeq), len););
saved_errno = errno;
if (w < 0)
{
break;
}
/*
* Pull the number of bytes we have written from
* queue with have.
*/
dcb->writeq = gwbuf_consume(dcb->writeq, w);
if (w < len)
{
/* We didn't write all the data */
}
}
}
spinlock_release(&dcb->writeqlock);
return 1; return 1;
} }