Fix m_randquote with 0 quotes

diff --git a/src/modules.cpp b/src/modules.cpp
index a7b3364ae1c919ba5b075837ea087ef86e75e630..d25e145e3fdaa19ec1f61a4b312e42d68f1b3cd6 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -765,7 +765,7 @@ bool FileReader::Exists()
 
 std::string FileReader::GetLine(int x)
 {
-       if ((x<0) || ((unsigned)x>fc.size()))
+       if ((x<0) || ((unsigned)x>=fc.size()))
                return "";
        return fc[x];
 }

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index dab3c93cd3f0ada2cbd277dec34479133b91677c..668eea0e5cc0e8a2d1ae8fa83b247b3150c23b9a 100644 (file)
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -41,12 +41,13 @@ class CommandRandquote : public Command
 
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
-               std::string str;
-               int fsize;
-
-               fsize = quotes->FileSize();
-               str = quotes->GetLine(ServerInstance->GenRandomInt(fsize));
-               user->WriteServ("NOTICE %s :%s%s%s",user->nick.c_str(),prefix.c_str(),str.c_str(),suffix.c_str());
+               int fsize = quotes->FileSize();
+               if (fsize)
+               {
+                       std::string str = quotes->GetLine(ServerInstance->GenRandomInt(fsize));
+                       if (!str.empty())
+                               user->WriteServ("NOTICE %s :%s%s%s",user->nick.c_str(),prefix.c_str(),str.c_str(),suffix.c_str());
+               }
 
                return CMD_SUCCESS;
        }