Make sure the channel exists before doing anything in OP and VOICE.

diff --git a/chanserv/chancmds/op.c b/chanserv/chancmds/op.c
index 0bf6d45e73bb4e0f9718a3c5a1b4d2c65c2d913d..f114118cb6f37c1f5ff9347bdd323718f1c613c5 100644 (file)
--- a/chanserv/chancmds/op.c
+++ b/chanserv/chancmds/op.c
@@ -81,6 +81,12 @@ int csc_doop(void *source, int cargc, char **cargv) {
     return CMD_ERROR;
 
   rcp=cip->exts[chanservext];
+  
+  /* If the channel doesn't currently exist, forget it. */
+  if (!cip->channel) { 
+    chanservstdmessage(sender, QM_EMPTYCHAN, cip->name->content);  
+    return CMD_ERROR;
+  }
 
   if (cargc==1) {
     /* Only one arg: "op me" */

diff --git a/chanserv/chancmds/voice.c b/chanserv/chancmds/voice.c
index b6c4b46895a8c9e03bb026fce11a1c36b3fd9e45..2a4a2bbb6aa782978c5322660e55b17294d39ef4 100644 (file)
--- a/chanserv/chancmds/voice.c
+++ b/chanserv/chancmds/voice.c
@@ -82,6 +82,11 @@ int csc_dovoice(void *source, int cargc, char **cargv) {
   if (!(cip=cs_checkaccess(sender, cargv[0], CA_VOICEPRIV, NULL, "voice", 0, 0)))
     return CMD_ERROR;
 
+  if (!cip->channel) {
+    chanservstdmessage(sender, QM_EMPTYCHAN, cip->name->content);
+    return CMD_ERROR;
+  }
+
   if (cargc==1) {
     /* Only one arg: "voice me" */
     if (!cs_checkaccess(sender, NULL, CA_VOICEPRIV | CA_DEVOICED, cip,