BUILD : 1.7.8 (621) BUGS : 314 NOTES : Fixed normalizeBuffer not being freed twice (anope_cmd_ctcp / delete_user)

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


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

17 files changed, 25 insertions, 3 deletions

diff --git a/Changes b/Changes
index cdc328155..70cd82ae9 100644
--- a/Changes
+++ b/Changes
@@ -8,6 +8,7 @@ Provided by Anope Dev. <dev@anope.org> - 2005
 02/13 A Internal Event support, see EVENTS in the doc folder for help     [ #00]
 02/05 A Support for Unreal 3.2 +I channel mode.                           [ #00]
 02/03 A Merged anope-win32 branch into the main, now Win32 ready.         [ #00]
+03/14 F Two normalized strings not being freed.                           [#314]
 03/14 F Various minor mistakes (see bugreport for full list).             [#313]
 03/14 F Sync state of servers was not recorded reliable enough.           [ #00]
 03/12 F Services setting already set channel modes.                       [ #00]
diff --git a/src/bahamut.c b/src/bahamut.c
index 793801343..253ec662c 100644
--- a/src/bahamut.c
+++ b/src/bahamut.c
@@ -1703,6 +1703,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "NOTICE %s :\1%s \1", dest, s);
+    free(s);
 }
 
 /* this avoids "undefined symbol" messages of those whom try to load mods that
diff --git a/src/dreamforge.c b/src/dreamforge.c
index 2165035c2..c82a279f3 100644
--- a/src/dreamforge.c
+++ b/src/dreamforge.c
@@ -1412,6 +1412,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "NOTICE %s :\1%s \1", dest, s);
+    free(s);
 }
 
 #endif
diff --git a/src/hybrid.c b/src/hybrid.c
index 2fa6315ca..ebdccfcec 100644
--- a/src/hybrid.c
+++ b/src/hybrid.c
@@ -1556,6 +1556,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "NOTICE %s :\1%s \1", dest, s);
+    free(s);
 }
 
 
diff --git a/src/plexus.c b/src/plexus.c
index e15348815..f88886beb 100644
--- a/src/plexus.c
+++ b/src/plexus.c
@@ -1653,6 +1653,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "NOTICE %s :\1%s \1", dest, s);
+    free(s);
 }
 
 #endif
diff --git a/src/ptlink.c b/src/ptlink.c
index a91a1271e..5960f4bd9 100644
--- a/src/ptlink.c
+++ b/src/ptlink.c
@@ -1740,6 +1740,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "NOTICE %s :\1%s \1", dest, s);
+    free(s);
 }
 
 #endif
diff --git a/src/rageircd.c b/src/rageircd.c
index c8a4019d6..8d3470f7b 100644
--- a/src/rageircd.c
+++ b/src/rageircd.c
@@ -1708,6 +1708,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "NOTICE %s :\1%s \1", dest, s);
+    free(s);
 }
 
 #endif
diff --git a/src/ratbox.c b/src/ratbox.c
index d0b5ef3e8..00e4b756f 100644
--- a/src/ratbox.c
+++ b/src/ratbox.c
@@ -1860,6 +1860,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "NOTICE %s :\1%s \1", dest, s);
+    free(s);
 }
 
 #endif
diff --git a/src/shadowircd.c b/src/shadowircd.c
index e97e25c03..1b52b8b73 100644
--- a/src/shadowircd.c
+++ b/src/shadowircd.c
@@ -1817,6 +1817,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "NOTICE %s :\1%s \1", dest, s);
+    free(s);
 }
 
 #endif
diff --git a/src/solidircd.c b/src/solidircd.c
index 028faf7fc..836b2a242 100644
--- a/src/solidircd.c
+++ b/src/solidircd.c
@@ -1740,6 +1740,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "%s NOTICE :\1%s \1", dest, s);
+    free(s);
 }
 
 #endif
diff --git a/src/ultimate2.c b/src/ultimate2.c
index 8c24f29bd..f5552e067 100644
--- a/src/ultimate2.c
+++ b/src/ultimate2.c
@@ -1766,6 +1766,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "NOTICE %s :\1%s \1", dest, s);
+    free(s);
 }
 
 #endif
diff --git a/src/ultimate3.c b/src/ultimate3.c
index 97fdddb62..0e567abc9 100644
--- a/src/ultimate3.c
+++ b/src/ultimate3.c
@@ -1849,6 +1849,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "NOTICE %s :\1%s \1", dest, s);
+    free(s);
 }
 
 #endif
diff --git a/src/unreal31.c b/src/unreal31.c
index a39c8e4fe..d82d515c5 100644
--- a/src/unreal31.c
+++ b/src/unreal31.c
@@ -1627,6 +1627,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "NOTICE %s :\1%s \1", dest, s);
+    free(s);
 }
 
 #endif
diff --git a/src/unreal32.c b/src/unreal32.c
index 5699717ca..762031eda 100644
--- a/src/unreal32.c
+++ b/src/unreal32.c
@@ -2255,6 +2255,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "%s %s :\1%s \1", send_token("NOTICE", "B"), dest, s);
+    free(s);
 }
 
 #endif
diff --git a/src/users.c b/src/users.c
index 8078acc20..784876728 100644
--- a/src/users.c
+++ b/src/users.c
@@ -196,18 +196,21 @@ void delete_user(User * user)
 {
     struct u_chanlist *c, *c2;
     struct u_chaninfolist *ci, *ci2;
+    char *realname;
 
     if (LogUsers) {
+        realname = normalizeBuffer(user->realname);
         if (ircd->vhost) {
             alog("LOGUSERS: %s (%s@%s => %s) (%s) left the network (%s).",
                  user->nick, user->username, user->host,
                  (user->vhost ? user->vhost : "(none)"),
-                 normalizeBuffer(user->realname), user->server->name);
+                 realname, user->server->name);
         } else {
             alog("LOGUSERS: %s (%s@%s) (%s) left the network (%s).",
                  user->nick, user->username, user->host,
-                 normalizeBuffer(user->realname), user->server->name);
+                 realname, user->server->name);
         }
+        free(realname);
     }
     send_event(EVENT_USER_LOGOFF, user->nick);
 
diff --git a/src/viagra.c b/src/viagra.c
index 772971ea2..8e215a604 100644
--- a/src/viagra.c
+++ b/src/viagra.c
@@ -1761,6 +1761,7 @@ void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...)
     }
 
     send_cmd(source, "NOTICE %s :\1%s \1", dest, s);
+    free(s);
 }
 
 #endif
diff --git a/version.log b/version.log
index dc7172293..064fdab60 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="8"
-VERSION_BUILD="620"
+VERSION_BUILD="621"
 
 # $Log$
 #
+# BUILD : 1.7.8 (621)
+# BUGS  : 314
+# NOTES : Fixed normalizeBuffer not being freed twice (anope_cmd_ctcp / delete_user)
+#
 # BUILD : 1.7.8 (620)
 # BUGS  : 313
 # NOTES : Fixed various mistakes, as listed in bug 313 (only the mydbgen issue is not done yet)