4 files changed, 22 insertions, 2 deletions
diff --git a/src/channels.c b/src/channels.c
index dacf98895..e4ae41475 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1869,6 +1869,7 @@ void do_mass_mode(char *modes)
     for (i = 0; i < 1024; i++) {
         for (c = chanlist[i]; c; c = c->next) {
             if (c->bouncy_modes) {
+                free(av);
                 free(myModes);
                 return;
             } else {
@@ -1877,6 +1878,7 @@ void do_mass_mode(char *modes)
             }
         }
     }
+    free(av);
     free(myModes);
 }
 
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index 04e84ecf4..315f92cc7 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -76,7 +76,7 @@ int do_list(User * u)
     int nchans, i;
     char buf[BUFSIZE];
     int is_servadmin = is_services_admin(u);
-    int count = 0, from = 0, to = 0;
+    int count = 0, from = 0, to = 0, tofree = 0;
     char *tmp = NULL;
     char *s = NULL;
     char *keyword;
@@ -101,21 +101,26 @@ int do_list(User * u)
                 }
                 for (s = tmp; *s; s++) {
                     if (!isdigit(*s)) {
+                        free(tmp);
                         return MOD_CONT;
                     }
                 }
                 from = atoi(tmp);
+                free(tmp);
                 tmp = myStrGetTokenRemainder(pattern, '-', 1);  /* Read TO out */
                 if (!tmp) {
                     return MOD_CONT;
                 }
                 for (s = tmp; *s; s++) {
                     if (!isdigit(*s)) {
+                        free(tmp);
                         return MOD_CONT;
                     }
                 }
                 to = atoi(tmp);
+                free(tmp);
                 pattern = sstrdup("*");
+                tofree = 1;
             }
         }
 
@@ -169,6 +174,8 @@ int do_list(User * u)
         notice_lang(s_ChanServ, u, CHAN_LIST_END,
                     nchans > CSListMax ? CSListMax : nchans, nchans);
     }
+    if (tofree)
+        free(pattern);
     return MOD_CONT;
 
 }
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index c8d096db7..ac26a2d0b 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -97,20 +97,24 @@ int listOut(User * u)
                 }
                 for (s = tmp; *s; s++) {
                     if (!isdigit(*s)) {
+                        free(tmp);
                         return MOD_CONT;
                     }
                 }
                 from = atoi(tmp);
+                free(tmp);
                 tmp = myStrGetTokenRemainder(key, '-', 1);      /* Read TO out */
                 if (!tmp) {
                     return MOD_CONT;
                 }
                 for (s = tmp; *s; s++) {
                     if (!isdigit(*s)) {
+                        free(tmp);
                         return MOD_CONT;
                     }
                 }
                 to = atoi(tmp);
+                free(tmp);
                 key = NULL;
             }
         }
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index 825406acd..91cd2d356 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -95,7 +95,7 @@ int do_list(User * u)
     NickRequest *nr = NULL;
     int nronly = 0;
     char noexpire_char = ' ';
-    int count = 0, from = 0, to = 0;
+    int count = 0, from = 0, to = 0, tofree = 0;
     char *tmp = NULL;
     char *s = NULL;
 
@@ -118,21 +118,26 @@ int do_list(User * u)
                 }
                 for (s = tmp; *s; s++) {
                     if (!isdigit(*s)) {
+                        free(tmp);
                         return MOD_CONT;
                     }
                 }
                 from = atoi(tmp);
+                free(tmp);
                 tmp = myStrGetTokenRemainder(pattern, '-', 1);  /* Read TO out */
                 if (!tmp) {
                     return MOD_CONT;
                 }
                 for (s = tmp; *s; s++) {
                     if (!isdigit(*s)) {
+                        free(tmp);
                         return MOD_CONT;
                     }
                 }
                 to = atoi(tmp);
+                free(tmp);
                 pattern = sstrdup("*");
+                tofree = 1;
             }
         }
 
@@ -222,5 +227,7 @@ int do_list(User * u)
         notice_lang(s_NickServ, u, NICK_LIST_RESULTS,
                     nnicks > NSListMax ? NSListMax : nnicks, nnicks);
     }
+    if (tofree)
+        free(pattern);
     return MOD_CONT;
 }