summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/core/bs_badwords.cpp4
-rw-r--r--modules/core/cs_access.cpp6
-rw-r--r--modules/core/cs_akick.cpp6
-rw-r--r--modules/core/cs_xop.cpp6
-rw-r--r--modules/core/ms_del.cpp2
-rw-r--r--modules/core/ms_list.cpp2
-rw-r--r--modules/core/ms_read.cpp2
-rw-r--r--modules/core/os_akill.cpp9
-rw-r--r--modules/core/os_session.cpp6
-rw-r--r--modules/core/os_snline.cpp9
-rw-r--r--modules/core/os_sqline.cpp9
-rw-r--r--modules/core/os_szline.cpp9
12 files changed, 53 insertions, 17 deletions
diff --git a/modules/core/bs_badwords.cpp b/modules/core/bs_badwords.cpp
index 52da7d777..d6fe6bfd5 100644
--- a/modules/core/bs_badwords.cpp
+++ b/modules/core/bs_badwords.cpp
@@ -31,7 +31,7 @@ class BadwordsListCallback : public NumberList
void HandleNumber(unsigned Number)
{
- if (Number > ci->GetBadWordCount())
+ if (!Number || Number > ci->GetBadWordCount())
return;
if (!SentHeader)
@@ -75,7 +75,7 @@ class BadwordsDelCallback : public NumberList
void HandleNumber(unsigned Number)
{
- if (Number > ci->GetBadWordCount())
+ if (!Number || Number > ci->GetBadWordCount())
return;
Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, c, ci) << "DEL " << ci->GetBadWord(Number -1 )->word;
diff --git a/modules/core/cs_access.cpp b/modules/core/cs_access.cpp
index 860632f58..2b94885a1 100644
--- a/modules/core/cs_access.cpp
+++ b/modules/core/cs_access.cpp
@@ -34,7 +34,7 @@ class AccessListCallback : public NumberList
virtual void HandleNumber(unsigned Number)
{
- if (Number > ci->GetAccessCount())
+ if (!Number || Number > ci->GetAccessCount())
return;
if (!SentHeader)
@@ -67,7 +67,7 @@ class AccessViewCallback : public AccessListCallback
void HandleNumber(unsigned Number)
{
- if (Number > ci->GetAccessCount())
+ if (!Number || Number > ci->GetAccessCount())
return;
if (!SentHeader)
@@ -134,7 +134,7 @@ class AccessDelCallback : public NumberList
void HandleNumber(unsigned Number)
{
- if (Number > ci->GetAccessCount())
+ if (!Number || Number > ci->GetAccessCount())
return;
ChanAccess *access = ci->GetAccess(Number - 1);
diff --git a/modules/core/cs_akick.cpp b/modules/core/cs_akick.cpp
index e3eaf4ebb..579c013f2 100644
--- a/modules/core/cs_akick.cpp
+++ b/modules/core/cs_akick.cpp
@@ -70,7 +70,7 @@ class AkickListCallback : public NumberList
virtual void HandleNumber(unsigned Number)
{
- if (Number > ci->GetAkickCount())
+ if (!Number || Number > ci->GetAkickCount())
return;
if (!SentHeader)
@@ -97,7 +97,7 @@ class AkickViewCallback : public AkickListCallback
void HandleNumber(unsigned Number)
{
- if (Number > ci->GetAkickCount())
+ if (!Number || Number > ci->GetAkickCount())
return;
if (!SentHeader)
@@ -150,7 +150,7 @@ class AkickDelCallback : public NumberList
void HandleNumber(unsigned Number)
{
- if (Number > ci->GetAkickCount())
+ if (!Number || Number > ci->GetAkickCount())
return;
++Deleted;
diff --git a/modules/core/cs_xop.cpp b/modules/core/cs_xop.cpp
index 21785f189..6e65918a9 100644
--- a/modules/core/cs_xop.cpp
+++ b/modules/core/cs_xop.cpp
@@ -123,7 +123,7 @@ class XOPListCallback : public NumberList
void HandleNumber(unsigned Number)
{
- if (Number > ci->GetAccessCount())
+ if (!Number || Number > ci->GetAccessCount())
return;
ChanAccess *access = ci->GetAccess(Number - 1);
@@ -177,7 +177,7 @@ class XOPDelCallback : public NumberList
void HandleNumber(unsigned Number)
{
- if (Number > ci->GetAccessCount())
+ if (!Number || Number > ci->GetAccessCount())
return;
ChanAccess *access = ci->GetAccess(Number - 1);
@@ -403,7 +403,7 @@ class XOPBase : public Command
u->SendMessage(ChanServ, messages[XOP_LIST_HEADER], ci->name.c_str());
}
- XOPListCallback::DoList(u, ci, access, i, level, messages);
+ XOPListCallback::DoList(u, ci, access, i + 1, level, messages);
}
if (!SentHeader)
diff --git a/modules/core/ms_del.cpp b/modules/core/ms_del.cpp
index 9c298c0be..4d9a8ec13 100644
--- a/modules/core/ms_del.cpp
+++ b/modules/core/ms_del.cpp
@@ -25,7 +25,7 @@ class MemoDelCallback : public NumberList
void HandleNumber(unsigned Number)
{
- if (Number > mi->memos.size())
+ if (!Number || Number > mi->memos.size())
return;
if (ci)
diff --git a/modules/core/ms_list.cpp b/modules/core/ms_list.cpp
index 1cd64f0cb..b1df87fa9 100644
--- a/modules/core/ms_list.cpp
+++ b/modules/core/ms_list.cpp
@@ -26,7 +26,7 @@ class MemoListCallback : public NumberList
void HandleNumber(unsigned Number)
{
- if (Number > mi->memos.size())
+ if (!Number || Number > mi->memos.size())
return;
if (!SentHeader)
diff --git a/modules/core/ms_read.cpp b/modules/core/ms_read.cpp
index 1828992bb..857fd661c 100644
--- a/modules/core/ms_read.cpp
+++ b/modules/core/ms_read.cpp
@@ -24,7 +24,7 @@ class MemoListCallback : public NumberList
void HandleNumber(unsigned Number)
{
- if (Number > mi->memos.size())
+ if (!Number || Number > mi->memos.size())
return;
MemoListCallback::DoRead(u, mi, NULL, Number - 1);
diff --git a/modules/core/os_akill.cpp b/modules/core/os_akill.cpp
index 858b71bc1..973aaecda 100644
--- a/modules/core/os_akill.cpp
+++ b/modules/core/os_akill.cpp
@@ -34,6 +34,9 @@ class AkillDelCallback : public NumberList
void HandleNumber(unsigned Number)
{
+ if (!Number)
+ return;
+
XLine *x = SGLine->GetEntry(Number - 1);
if (!x)
@@ -69,6 +72,9 @@ class AkillListCallback : public NumberList
void HandleNumber(unsigned Number)
{
+ if (!Number)
+ return;
+
XLine *x = SGLine->GetEntry(Number - 1);
if (!x)
@@ -98,6 +104,9 @@ class AkillViewCallback : public AkillListCallback
void HandleNumber(unsigned Number)
{
+ if (!Number)
+ return;
+
XLine *x = SGLine->GetEntry(Number - 1);
if (!x)
diff --git a/modules/core/os_session.cpp b/modules/core/os_session.cpp
index 51f98b951..17b2a7aa1 100644
--- a/modules/core/os_session.cpp
+++ b/modules/core/os_session.cpp
@@ -35,7 +35,7 @@ class ExceptionDelCallback : public NumberList
virtual void HandleNumber(unsigned Number)
{
- if (Number > exceptions.size())
+ if (!Number || Number > exceptions.size())
return;
++Deleted;
@@ -64,7 +64,7 @@ class ExceptionListCallback : public NumberList
virtual void HandleNumber(unsigned Number)
{
- if (Number > exceptions.size())
+ if (!Number || Number > exceptions.size())
return;
if (!SentHeader)
@@ -95,7 +95,7 @@ class ExceptionViewCallback : public ExceptionListCallback
void HandleNumber(unsigned Number)
{
- if (Number > exceptions.size())
+ if (!Number || Number > exceptions.size())
return;
if (!SentHeader)
diff --git a/modules/core/os_snline.cpp b/modules/core/os_snline.cpp
index d6a0d8844..fb83f5e52 100644
--- a/modules/core/os_snline.cpp
+++ b/modules/core/os_snline.cpp
@@ -35,6 +35,9 @@ class SNLineDelCallback : public NumberList
void HandleNumber(unsigned Number)
{
+ if (!Number)
+ return;
+
XLine *x = SNLine->GetEntry(Number - 1);
if (!x)
@@ -68,6 +71,9 @@ class SNLineListCallback : public NumberList
virtual void HandleNumber(unsigned Number)
{
+ if (!Number)
+ return;
+
XLine *x = SNLine->GetEntry(Number - 1);
if (!x)
@@ -97,6 +103,9 @@ class SNLineViewCallback : public SNLineListCallback
void HandleNumber(unsigned Number)
{
+ if (!Number)
+ return;
+
XLine *x = SNLine->GetEntry(Number - 1);
if (!x)
diff --git a/modules/core/os_sqline.cpp b/modules/core/os_sqline.cpp
index 6ce51a518..e409c1bd7 100644
--- a/modules/core/os_sqline.cpp
+++ b/modules/core/os_sqline.cpp
@@ -34,6 +34,9 @@ class SQLineDelCallback : public NumberList
void HandleNumber(unsigned Number)
{
+ if (!Number)
+ return;
+
XLine *x = SQLine->GetEntry(Number - 1);
if (!x)
@@ -67,6 +70,9 @@ class SQLineListCallback : public NumberList
virtual void HandleNumber(unsigned Number)
{
+ if (!Number)
+ return;
+
XLine *x = SQLine->GetEntry(Number - 1);
if (!x)
@@ -96,6 +102,9 @@ class SQLineViewCallback : public SQLineListCallback
void HandleNumber(unsigned Number)
{
+ if (!Number)
+ return;
+
XLine *x = SQLine->GetEntry(Number - 1);
if (!x)
diff --git a/modules/core/os_szline.cpp b/modules/core/os_szline.cpp
index caea0424b..2421cbdf6 100644
--- a/modules/core/os_szline.cpp
+++ b/modules/core/os_szline.cpp
@@ -34,6 +34,9 @@ class SZLineDelCallback : public NumberList
void HandleNumber(unsigned Number)
{
+ if (!Number)
+ return;
+
XLine *x = SZLine->GetEntry(Number - 1);
if (!x)
@@ -67,6 +70,9 @@ class SZLineListCallback : public NumberList
virtual void HandleNumber(unsigned Number)
{
+ if (!Number)
+ return;
+
XLine *x = SZLine->GetEntry(Number - 1);
if (!x)
@@ -96,6 +102,9 @@ class SZLineViewCallback : public SZLineListCallback
void HandleNumber(unsigned Number)
{
+ if (!Number)
+ return;
+
XLine *x = SZLine->GetEntry(Number - 1);
if (!x)
generated by cgit (git 2.34.1) at 2025-06-17 09:28:18 +0000