BUILD : 1.7.21 (1365) BUGS : 850, 851, 852 NOTES : Fixed several memory leaks reported by Trystan. Do not forget to free allocated memory!

git-svn-id: svn://svn.anope.org/anope/trunk@1365 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1080 5417fbe8-f217-4b02-8779-1006273d7864

5 files changed, 21 insertions, 3 deletions

diff --git a/Changes b/Changes
index 1676ad8f1..50ca9ebbc 100644
--- a/Changes
+++ b/Changes
@@ -17,6 +17,9 @@ Anope Version  S V N
 01/26 F Memory leaks in HostServ SETALL.                                  [#841]
 01/26 F Memory leak in ChanServ AKICK.                                    [#842]
 01/26 F Removed broken detection of Windows MCE/Tablet edition.           [#845]
+02/04 F Memleak in botchanmsgs(), botserv.c                               [#850]
+02/04 F Memleak in bs_fantasy_seen.c                                      [#851]
+02/04 F Memleak in bs_fantasy_unban.c                                     [#852]
 
 Provided by Jan Milants <jan_renee@msn.com> - 2008
 01/16 F Server traversion with next_server() failed to list all servers.  [#831]
diff --git a/src/botserv.c b/src/botserv.c
index 8f76fa5f9..cc2dadd89 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -282,6 +282,9 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf)
                                     && (stristr(nbuf, wordbuf)))) {
                                 mustkick = 1;
                             }
+
+                            /* free previous (sc)allocated memory (#850) */
+                            free(wordbuf);
                         }
                     }
                 } else if (bw->type == BW_START) {
@@ -341,13 +344,16 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf)
                         bot_kick(ci, u, BOT_REASON_BADWORD_GENTLE);
                     else
                         bot_kick(ci, u, BOT_REASON_BADWORD, bw->word);
+
+                    /* free the normalized buffer before return (#850) */
+                    Anope_Free(nbuf);
+
                     return;
                 }
             }
 
             /* Free the normalized buffer */
-            if (nbuf)
-                free(nbuf);
+            Anope_Free(nbuf);
         }
 
         /* Flood kicker */
diff --git a/src/core/bs_fantasy_seen.c b/src/core/bs_fantasy_seen.c
index d7548f117..75abdd26b 100644
--- a/src/core/bs_fantasy_seen.c
+++ b/src/core/bs_fantasy_seen.c
@@ -131,6 +131,8 @@ int do_fantasy(int argc, char **argv)
                      target);
             anope_cmd_privmsg(ci->bi->nick, ci->name, "%s", buf);
         }
+        /* free myStrGetToken(ed) variable target (#851) */
+        Anope_Free(target);
     }
 
     return MOD_CONT;
diff --git a/src/core/bs_fantasy_unban.c b/src/core/bs_fantasy_unban.c
index 7f0bc7f5a..a17e06551 100644
--- a/src/core/bs_fantasy_unban.c
+++ b/src/core/bs_fantasy_unban.c
@@ -73,6 +73,9 @@ int do_fantasy(int argc, char **argv)
             common_unban(ci, u->nick);
         else
             common_unban(ci, target);
+
+        /* free target if needed (#852) */
+        Anope_Free(target);
     }
 
     return MOD_CONT;
diff --git a/version.log b/version.log
index 0bfe1bd41..2c125f83a 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="21"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1364"
+VERSION_BUILD="1365"
 
 # $Log$
 #
+# BUILD : 1.7.21 (1365)
+# BUGS  : 850, 851, 852
+# NOTES : Fixed several memory leaks reported by Trystan. Do not forget to free allocated memory!
+#
 # BUILD : 1.7.21 (1364)
 # BUGS  : 844
 # NOTES : Removed broken version checking for windows media center edition and tablet edition; free(Jobe);