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

MXS-1939 Ensure no leaks when there is an array of rules

Browse Source 
In case an array of cache rules is provided, we will only store
references to the objects in the array. Consequently, the counts of
the borrewed references to the objects must be increased, and the
reference count of the array itself decreased.
This commit is contained in:
Johan Wikman
2018-06-25 12:08:44 +03:00
parent b7451c13bf
commit f7ca8d1494
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/modules/filter/cache/rules.cc vendored
View File

@ -2020,6 +2020,11 @@ static bool cache_rules_create_from_json(json_t* pRoot, uint32_t debug,
if (pRules)
{
ppRules[i] = pRules;
// The array element reference was borrowed, so now that we
// know a rule could be created, we must increase the reference
// count. Otherwise bad things will happen when the reference of
// the root object is decreased.
json_incref(pObject);
}
else
{
@ -2032,6 +2037,10 @@ static bool cache_rules_create_from_json(json_t* pRoot, uint32_t debug,
*pppRules = ppRules;
*pnRules = nRules;
// We only store the objects in the array, so now we must get rid
// of the array so that it does not leak.
json_decref(pRoot);
rv = true;
}
else