MXS-2046: Fix additional memory leaks

A set of memory leaks were revealed by Valgrind.
This commit is contained in:
Markus Mäkelä
2018-09-13 13:56:19 +03:00
parent ce602daf10
commit bee7cc2002
6 changed files with 35 additions and 32 deletions

View File

@ -1225,6 +1225,7 @@ newSession(MXS_ROUTER *instance, MXS_SESSION *session)
slave->gtid_maps = NULL;
memset(&slave->f_info, 0, sizeof (MARIADB_GTID_INFO));
slave->annotate_rows = false;
slave->warning_msg = NULL;
/**
* Add this session to the list of active sessions.
@ -1312,6 +1313,7 @@ static void freeSession(MXS_ROUTER* router_instance,
{
MXS_FREE(slave->mariadb_gtid);
}
MXS_FREE(slave->warning_msg);
MXS_FREE(slave);
}
@ -1414,7 +1416,9 @@ routeQuery(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session, GWBUF *queu
ROUTER_INSTANCE *router = (ROUTER_INSTANCE *)instance;
ROUTER_SLAVE *slave = (ROUTER_SLAVE *)router_session;
return blr_slave_request(router, slave, queue);
int rc = blr_slave_request(router, slave, queue);
gwbuf_free(queue);
return rc;
}
static char *event_names[] =