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

Add GWBUF_POINTER_IN_BUFFER macro; add extra free calls to remove memory leaks.

Browse Source
This commit is contained in:
counterpoint
2015-09-22 11:54:47 +01:00
parent 15f042f083
commit 95a4daecc9
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/include/buffer.h
View File

@ -168,6 +168,9 @@ typedef struct gwbuf {
/*< Consume a number of bytes in the buffer */ /*< Consume a number of bytes in the buffer */
#define GWBUF_CONSUME(b, bytes) ((b)->start = bytes > ((char *)(b)->end - (char *)(b)->start) ? (b)->end : (void *)((char *)(b)->start + (bytes))); #define GWBUF_CONSUME(b, bytes) ((b)->start = bytes > ((char *)(b)->end - (char *)(b)->start) ? (b)->end : (void *)((char *)(b)->start + (bytes)));
/*< Check if a given pointer is within the buffer */
#define GWBUF_POINTER_IN_BUFFER (ptr, b) ((char *)(ptr) >= (char *)(b)->start && (char *)(ptr) < (char *)(b)->end)
/*< Consume a complete buffer */ /*< Consume a complete buffer */
#define GWBUF_CONSUME_ALL(b) gwbuf_consume((b), GWBUF_LENGTH((b))) #define GWBUF_CONSUME_ALL(b) gwbuf_consume((b), GWBUF_LENGTH((b)))

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

@ -406,6 +406,7 @@ static int gw_read_backend_event(DCB *dcb) {
} }
else else
{ {
gwbuf_free(errbuf);
dcb->dcb_errhandle_called = true; dcb->dcb_errhandle_called = true;
dcb_close(dcb); dcb_close(dcb);
rc = 1; rc = 1;

12
server/modules/protocol/mysql_client.c
View File

@ -817,6 +817,10 @@ int gw_read_client_event(
"Session will be closed."))); "Session will be closed.")));
} }
rc = 1; rc = 1;
while (read_buffer)
{
read_buffer = gwbuf_consume(read_buffer, GWBUF_LENGTH(read_buffer));
}
goto return_rc; goto return_rc;
} }
} }
@ -828,6 +832,10 @@ int gw_read_client_event(
2, 2,
0, 0,
"failed to create new session"); "failed to create new session");
while (read_buffer)
{
read_buffer = gwbuf_consume(read_buffer, GWBUF_LENGTH(read_buffer));
}
return 0; return 0;
} }
} }
@ -1204,6 +1212,10 @@ int gw_read_client_event(
"Session will be closed."))); "Session will be closed.")));
} }
while (read_buffer)
{
read_buffer = gwbuf_consume(read_buffer, GWBUF_LENGTH(read_buffer));
}
} }
} }
} }