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

MXS-2585: Check for failed allocations

Browse Source 
Since nothrow was used, the return value should be checked. By moving the
null-check after the node allocation part, we'll detect it.
This commit is contained in:
Markus Mäkelä
2020-07-03 05:47:44 +03:00
parent ba289dc589
commit ad4bd26ff0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -551,11 +551,6 @@ cache_result_t LRUStorage::get_new_node(const CACHE_KEY& key,
mxb_assert(m_stats.items == m_max_count); mxb_assert(m_stats.items == m_max_count);
pNode = vacate_lru(); pNode = vacate_lru();
} }
if (!pNode)
{
result = CACHE_RESULT_ERROR;
}
} }
else else
{ {
@ -578,6 +573,10 @@ cache_result_t LRUStorage::get_new_node(const CACHE_KEY& key,
result = CACHE_RESULT_OUT_OF_RESOURCES; result = CACHE_RESULT_OUT_OF_RESOURCES;
} }
} }
else
{
result = CACHE_RESULT_ERROR;
}
if (CACHE_RESULT_IS_OK(result)) if (CACHE_RESULT_IS_OK(result))
{ {