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

Fixed a couple of memory leaks

Browse Source
This commit is contained in:
Mark Riddoch
2014-05-23 09:08:02 +01:00
parent 3b984d2773
commit 23a9759fca
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/dcb.c
View File

@ -255,6 +255,8 @@ dcb_add_to_zombieslist(DCB *dcb)
static void static void
dcb_final_free(DCB *dcb) dcb_final_free(DCB *dcb)
{ {
DCB_CALLBACK *cb;
CHK_DCB(dcb); CHK_DCB(dcb);
ss_info_dassert(dcb->state == DCB_STATE_DISCONNECTED, ss_info_dassert(dcb->state == DCB_STATE_DISCONNECTED,
"dcb not in DCB_STATE_DISCONNECTED state."); "dcb not in DCB_STATE_DISCONNECTED state.");
@ -315,6 +317,14 @@ dcb_final_free(DCB *dcb)
while ((queue = gwbuf_consume(queue, GWBUF_LENGTH(queue))) != NULL); while ((queue = gwbuf_consume(queue, GWBUF_LENGTH(queue))) != NULL);
} }
spinlock_acquire(&dcb->cb_lock);
while ((cb = dcb->callbacks) != NULL)
{
dcb->callbacks = cb->next;
free(cb);
}
spinlock_release(&dcb->cb_lock);
bitmask_free(&dcb->memdata.bitmask); bitmask_free(&dcb->memdata.bitmask);
simple_mutex_done(&dcb->dcb_read_lock); simple_mutex_done(&dcb->dcb_read_lock);
simple_mutex_done(&dcb->dcb_write_lock); simple_mutex_done(&dcb->dcb_write_lock);

6
server/modules/routing/binlog/blr.c
View File

@ -398,6 +398,12 @@ int prev_val;
router, router,
prev_val-1))); prev_val-1)));
if (slave->hostname)
free(slave->hostname);
if (slave->user)
free(slave->user);
if (slave->passwd)
free(slave->passwd);
free(slave); free(slave);
} }