diff options
Diffstat (limited to 'src/modules/m_hostchange.cpp')
| -rw-r--r-- | src/modules/m_hostchange.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp index d6d79286c..d10441f2b 100644 --- a/src/modules/m_hostchange.cpp +++ b/src/modules/m_hostchange.cpp @@ -192,9 +192,15 @@ public: auto tag = ServerInstance->Config->ConfValue("hostname"); const std::string hmap = tag->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789", 1); - hostmap.reset(); + CharState newhostmap; for (const auto& chr : hmap) - hostmap.set(static_cast<unsigned char>(chr)); + { + // A hostname can not contain NUL, LF, CR, or SPACE. + if (chr == 0x00 || chr == 0x0A || chr == 0x0D || chr == 0x20) + throw ModuleException(this, InspIRCd::Format("<hostname:charmap> can not contain character 0x%02X (%c)", chr, chr)); + newhostmap.set(static_cast<unsigned char>(chr)); + } + std::swap(newhostmap, hostmap); hostrules.swap(rules); } |