From 822e2ca5aa84cb5f46bfa42b8bb7481231fdf691 Mon Sep 17 00:00:00 2001 From: danieldg Date: Sat, 17 Oct 2009 19:12:19 +0000 Subject: Fix array out-of-bounds accesses git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11890 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_cloaking.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index 1a1ff039e..3be6e2163 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -377,10 +377,10 @@ class ModuleCloaking : public Module * We must limit the keys or else we get different results on * amd64/x86 boxes. - psychon */ const unsigned int limit = 0x80000000; - compatkey[1] = (unsigned int) Conf.ReadInteger("cloak","key1",0,false); - compatkey[2] = (unsigned int) Conf.ReadInteger("cloak","key2",0,false); - compatkey[3] = (unsigned int) Conf.ReadInteger("cloak","key3",0,false); - compatkey[4] = (unsigned int) Conf.ReadInteger("cloak","key4",0,false); + compatkey[0] = (unsigned int) Conf.ReadInteger("cloak","key1",0,false); + compatkey[1] = (unsigned int) Conf.ReadInteger("cloak","key2",0,false); + compatkey[2] = (unsigned int) Conf.ReadInteger("cloak","key3",0,false); + compatkey[3] = (unsigned int) Conf.ReadInteger("cloak","key4",0,false); if (!lowercase) { @@ -400,17 +400,17 @@ class ModuleCloaking : public Module if (prefix.empty()) prefix = ServerInstance->Config->Network; - if (!compatkey[1] || !compatkey[2] || !compatkey[3] || !compatkey[4] || - compatkey[1] >= limit || compatkey[2] >= limit || compatkey[3] >= limit || compatkey[4] >= limit) + if (!compatkey[0] || !compatkey[1] || !compatkey[2] || !compatkey[3] || + compatkey[0] >= limit || compatkey[1] >= limit || compatkey[2] >= limit || compatkey[3] >= limit) { std::string detail; - if (!compatkey[1] || compatkey[1] >= limit) + if (!compatkey[0] || compatkey[0] >= limit) detail = " is not valid, it may be set to a too high/low value, or it may not exist."; - else if (!compatkey[2] || compatkey[2] >= limit) + else if (!compatkey[1] || compatkey[1] >= limit) detail = " is not valid, it may be set to a too high/low value, or it may not exist."; - else if (!compatkey[3] || compatkey[3] >= limit) + else if (!compatkey[2] || compatkey[2] >= limit) detail = " is not valid, it may be set to a too high/low value, or it may not exist."; - else if (!compatkey[4] || compatkey[4] >= limit) + else if (!compatkey[3] || compatkey[3] >= limit) detail = " is not valid, it may be set to a too high/low value, or it may not exist."; throw ModuleException("You have not defined cloak keys for m_cloaking!!! THIS IS INSECURE AND SHOULD BE CHECKED! - " + detail); -- cgit v1.2.3