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

MXS-1615 Fix access of wrong argument

Browse Source 
- Wrong argument accessed at command invocation. In debug mode
  leads to crash, in release mode probably leads to crash.
- Log result of reload.
This commit is contained in:
Johan Wikman
2018-01-17 12:05:04 +02:00
parent a4f6176ced
commit c02da103d7
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/modules/filter/masking/maskingfilter.cc
View File

@ -39,9 +39,9 @@ char VERSION_STRING[] = "V1.0.0";
bool masking_command_reload(const MODULECMD_ARG* pArgs, json_t** output) bool masking_command_reload(const MODULECMD_ARG* pArgs, json_t** output)
{ {
ss_dassert(pArgs->argc == 1); ss_dassert(pArgs->argc == 1);
ss_dassert(MODULECMD_GET_TYPE(&pArgs->argv[1].type) == MODULECMD_ARG_FILTER); ss_dassert(MODULECMD_GET_TYPE(&pArgs->argv[0].type) == MODULECMD_ARG_FILTER);
const MXS_FILTER_DEF* pFilterDef = pArgs->argv[1].value.filter; const MXS_FILTER_DEF* pFilterDef = pArgs->argv[0].value.filter;
ss_dassert(pFilterDef); ss_dassert(pFilterDef);
MaskingFilter* pFilter = reinterpret_cast<MaskingFilter*>(filter_def_get_instance(pFilterDef)); MaskingFilter* pFilter = reinterpret_cast<MaskingFilter*>(filter_def_get_instance(pFilterDef));
@ -178,9 +178,17 @@ bool MaskingFilter::reload()
if (sRules.get()) if (sRules.get())
{ {
MXS_NOTICE("Rules for masking filter '%s' were reloaded from '%s'.",
m_config.name().c_str(), m_config.rules().c_str());
m_sRules = sRules; m_sRules = sRules;
rval = true; rval = true;
} }
else
{
MXS_ERROR("Rules for masking filter '%s' could not be reloaded from '%s'.",
m_config.name().c_str(), m_config.rules().c_str());
}
return rval; return rval;
} }