summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2015-02-27 01:25:12 +0100
committerAttila Molnar <attilamolnar@hush.com>2015-02-27 01:25:12 +0100
commit8236f2c376e8a76662da2126b2a1c4c9f90f7716 (patch)
treeb94a603d30610b80052c13b9e8b926f0e8f7eafe /src
parent71f93ea1b3e5091620dd3a3faa04389447272223 (diff)
Fix oversights in substr() conversion
Thanks to @StevenVanAcker for reporting and testing this
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_ldapauth.cpp2
-rw-r--r--src/users.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp
index 804f6b821..7da63284a 100644
--- a/src/modules/m_ldapauth.cpp
+++ b/src/modules/m_ldapauth.cpp
@@ -64,7 +64,7 @@ class BindInterface : public LDAPInterface
while (i < text.length() - 1 && isalpha(text[i + 1]))
++i;
- std::string key(start, (i - start) + 1);
+ std::string key(text, start, (i - start) + 1);
result.append(replacements[key]);
}
else
diff --git a/src/users.cpp b/src/users.cpp
index 12243c64b..d760c713f 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -764,7 +764,7 @@ void LocalUser::Write(const std::string& text)
if (text.length() > ServerInstance->Config->Limits.MaxLine - 2)
{
// this should happen rarely or never. Crop the string at 512 and try again.
- std::string try_again(0, ServerInstance->Config->Limits.MaxLine - 2);
+ std::string try_again(text, 0, ServerInstance->Config->Limits.MaxLine - 2);
Write(try_again);
return;
}