pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-29 13:16:37 +02:00
Code Activity

Bug #1222 - Fixed crash from reading to read a range of memos

Browse Source
This commit is contained in:
Adam
2010-12-27 01:00:12 -05:00
parent 49dd1c3409
commit d896bf9a1c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/ms_read.cpp
+6 -6
View File
@@ -49,7 +49,7 @@ class MemoListCallback : public NumberList
class CommandMSRead : public Command
{
public:
CommandMSRead() : Command("READ", 0, 2)
CommandMSRead() : Command("READ", 1, 2)
{
}
@@ -59,8 +59,7 @@ class CommandMSRead : public Command
MemoInfo *mi;
ChannelInfo *ci = NULL;
Anope::string numstr = !params.empty() ? params[0] : "", chan;
int num;
Anope::string numstr = params[0], chan;
if (!numstr.empty() && numstr[0] == '#')
{
@@ -81,8 +80,8 @@ class CommandMSRead : public Command
}
else
mi = &u->Account()->memos;
num = !numstr.empty() && numstr.is_number_only() ? convertTo<int>(numstr) : -1;
if (numstr.empty() || (!numstr.equals_ci("LAST") && !numstr.equals_ci("NEW") && num <= 0))
if (numstr.empty() || (!numstr.equals_ci("LAST") && !numstr.equals_ci("NEW") && !numstr.is_number_only()))
this->OnSyntaxError(source, numstr);
else if (mi->memos.empty())
{
@@ -91,7 +90,8 @@ class CommandMSRead : public Command
else
source.Reply(MEMO_HAVE_NO_MEMOS);
}
else {
else
{
int i, end;
if (numstr.equals_ci("NEW"))