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

Fix fixing of std::string object names

Browse Source 
Comparing two fixed std::strings would have equal C strings but comparing
with operator== they would be different. This was a result of the string
modification done by fix_object_name.

Converted the internal header into a C++ header, added std::string
overload and fixed use of the function.
This commit is contained in:
Markus Mäkelä
2018-07-29 10:59:58 +03:00
parent afde1fa072
commit 3be975ba5d
11 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/core/config.cc
View File

@ -50,7 +50,7 @@
#include <maxscale/utils.hh>
#include <maxscale/version.h>
#include "internal/config.h"
#include "internal/config.hh"
#include "internal/event.hh"
#include "internal/filter.hh"
#include "internal/modules.h"
@ -550,6 +550,14 @@ void fix_object_name(char *name)
replace_whitespace(name);
}
void fix_object_name(std::string& name)
{
char buf[name.size() + 1];
strcpy(buf, name.c_str());
fix_object_name(buf);
name.assign(buf);
}
static bool is_empty_string(const char* str)
{
for (const char* p = str; *p; p++)
@ -3206,9 +3214,9 @@ int configure_new_service(CONFIG_CONTEXT *obj)
Service *service = static_cast<Service*>(obj->element);
ss_dassert(service);
for (auto&& a: mxs::strtok(config_get_string(obj->parameters, CN_SERVERS), ","))
for (auto&& a : mxs::strtok(config_get_string(obj->parameters, CN_SERVERS), ","))
{
fix_object_name(&a[0]);
fix_object_name(a);
if (SERVER* s = server_find_by_unique_name(a.c_str()))
{
@ -3246,9 +3254,9 @@ int create_new_monitor(CONFIG_CONTEXT *obj, std::set<std::string>& monitored_ser
bool err = false;
// TODO: Use server list parameter type for this
for (auto&& s: mxs::strtok(config_get_string(obj->parameters, CN_SERVERS), ","))
for (auto&& s : mxs::strtok(config_get_string(obj->parameters, CN_SERVERS), ","))
{
fix_object_name(&s[0]);
fix_object_name(s);
SERVER* server = server_find_by_unique_name(s.c_str());
if (!server)