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

Fix mock-framework

Browse Source 
Got broken due to changes in how configuration settings are handled.
This commit is contained in:
Johan Wikman
2019-02-08 12:12:31 +02:00
parent 2e270ce1ac
commit 3550048c19
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/modules/filter/test/module.cc
View File

@ -12,6 +12,7 @@
*/ */
#include "maxscale/module.hh" #include "maxscale/module.hh"
#include <maxscale/alloc.h>
#include <string> #include <string>
#include "../../../core/internal/modules.hh" #include "../../../core/internal/modules.hh"
@ -38,14 +39,14 @@ Module::ConfigParameters::ConfigParameters(const MXS_MODULE_PARAM* pParams)
{ {
if (this->name == NULL) if (this->name == NULL)
{ {
this->name = const_cast<char*>(pParams->name); this->name = MXS_STRDUP(const_cast<char*>(pParams->name));
this->value = const_cast<char*>(pParams->default_value); this->value = MXS_STRDUP(const_cast<char*>(pParams->default_value));
} }
else else
{ {
MXS_CONFIG_PARAMETER* pNext = new MXS_CONFIG_PARAMETER; MXS_CONFIG_PARAMETER* pNext = new MXS_CONFIG_PARAMETER;
pNext->name = const_cast<char*>(pParams->name); pNext->name = MXS_STRDUP(const_cast<char*>(pParams->name));
pNext->value = const_cast<char*>(pParams->default_value); pNext->value = MXS_STRDUP(const_cast<char*>(pParams->default_value));
pNext->next = NULL; pNext->next = NULL;
pCurrent->next = pNext; pCurrent->next = pNext;
@ -92,7 +93,7 @@ void Module::ConfigParameters::set_value(const char* zName, const std::string& v
pParam = new MXS_CONFIG_PARAMETER; pParam = new MXS_CONFIG_PARAMETER;
m_values.push_back(zName); m_values.push_back(zName);
pParam->name = const_cast<char*>(m_values.back().c_str()); pParam->name = MXS_STRDUP(const_cast<char*>(m_values.back().c_str()));
pParam->value = NULL; pParam->value = NULL;
pParam->next = NULL; pParam->next = NULL;
@ -101,7 +102,7 @@ void Module::ConfigParameters::set_value(const char* zName, const std::string& v
m_values.push_back(value); m_values.push_back(value);
pParam->value = const_cast<char*>(m_values.back().c_str()); pParam->value = MXS_STRDUP(const_cast<char*>(m_values.back().c_str()));
} }
const MXS_CONFIG_PARAMETER* Module::ConfigParameters::get_param(const char* zName) const const MXS_CONFIG_PARAMETER* Module::ConfigParameters::get_param(const char* zName) const