CHANSERV: fix issue where chanserv_relay doesn't wait for db to be loaded before...

[irc/quakenet/newserv.git] / newsearch / ns-kill.c

diff --git a/newsearch/ns-kill.c b/newsearch/ns-kill.c
index ff56e670e502d07ce706e47574f05682fb8c97f5..f0cb2deaa3e253aab1ef33a3c9d3090a2a2917a0 100644 (file)
--- a/newsearch/ns-kill.c
+++ b/newsearch/ns-kill.c
@@ -40,15 +40,25 @@ struct searchNode *kill_parse(searchCtx *ctx, int argc, char **argv) {
   else if (ctx->searchcmd == reg_nicksearch) 
     localdata->marker = nextnickmarker();
   else {
+    free(localdata);
     parseError = "kill: invalid search type";
     return NULL;
   }
 
-  if (argc==1)
-    strlcpy(localdata->reason, argv[0], sizeof(localdata->reason));
-  else
+  if (argc==1) {
+    struct searchNode *reasonstr;
+    char *p;
+    if (!(reasonstr=argtoconststr("kill", ctx, argv[0], &p))) {
+      free(localdata);
+      return NULL;
+    }
+    
+    strlcpy(localdata->reason, p, sizeof(localdata->reason));
+    reasonstr->free(ctx, reasonstr);
+  } else {
     strlcpy(localdata->reason, defaultreason, sizeof(localdata->reason));
-
+  }
+  
   if (!(thenode=(struct searchNode *)malloc(sizeof (struct searchNode)))) {
     /* couldn't malloc() memory for thenode, so free localdata to avoid leakage */
     parseError = "malloc: could not allocate memory for this search.";