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

Prevent double free of rerouted queries

Browse Source 
When the routing of a queued query fails, the route_stored_query function
extract the SQL from and frees the already freed buffer.
This commit is contained in:
Markus Mäkelä
2018-02-14 12:36:00 +02:00
parent 5941f9d3b3
commit 4853fb0c64
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/modules/routing/readwritesplit/readwritesplit.cc
View File

@ -485,18 +485,7 @@ static bool route_stored_query(RWSplitSession *rses)
if (!routeQuery((MXS_ROUTER*)rses->router, (MXS_ROUTER_SESSION*)rses, query_queue)) if (!routeQuery((MXS_ROUTER*)rses->router, (MXS_ROUTER_SESSION*)rses, query_queue))
{ {
rval = false; rval = false;
char* sql = modutil_get_SQL(query_queue); MXS_ERROR("Failed to route queued query.");
if (sql)
{
MXS_ERROR("Routing query \"%s\" failed.", sql);
MXS_FREE(sql);
}
else
{
MXS_ERROR("Failed to route query.");
}
gwbuf_free(query_queue);
} }
if (rses->query_queue == NULL) if (rses->query_queue == NULL)