4 files changed, 17 insertions, 15 deletions

diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 043e169f1..ebc694745 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -824,6 +824,7 @@ int anope_event_fjoin(const char *source, int ac, const char **av)
 		}
 		strncat(nicklist, prefixandnick, 513);
 		strncat(nicklist, " ", 513);
+		delete [] curnick;
 		curtoken++;
 		curnick = myStrGetToken(av[2], ' ', curtoken);
 		nlen = 0;
@@ -884,7 +885,7 @@ int anope_event_topic(const char *source, int ac, const char **av)
 		return MOD_CONT;
 
 	if (c->topic) {
-		free(c->topic);
+		delete [] c->topic;
 		c->topic = NULL;
 	}
 	if (ac > 1 && *av[1])
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index 44f294439..205e91897 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -882,6 +882,7 @@ int anope_event_fjoin(const char *source, int ac, const char **av)
 endnick:
 		strncat(nicklist, prefixandnick, 513);
 		strncat(nicklist, " ", 513);
+		delete [] curnick;
 		curtoken++;
 		curnick = myStrGetToken(av[ac - 1], ' ', curtoken);
 		nlen = 0;
@@ -933,7 +934,7 @@ int anope_event_topic(const char *source, int ac, const char **av)
 		return MOD_CONT;
 
 	if (c->topic) {
-		free(c->topic);
+		delete [] c->topic;
 		c->topic = NULL;
 	}
 	if (ac > 1 && *av[1])
@@ -1369,7 +1370,7 @@ class ProtoInspIRCd : public Module
 
 	~ProtoInspIRCd()
 	{
-		free(TS6SID);
+		delete [] TS6SID;
 	}
 };
 
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 245ae5f91..a91d676a6 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -763,7 +763,7 @@ int anope_event_topic(const char *source, int ac, const char **av)
 			return MOD_CONT;
 
 		if (c->topic) {
-			free(c->topic);
+			delete [] c->topic;
 			c->topic = NULL;
 		}
 		if (ac > 1 && *av[1])
@@ -808,18 +808,18 @@ int anope_event_tburst(const char *source, int ac, const char **av)
 				 merge_args(ac - 1, av + 1), av[0]);
 		}
 		if (setter)
-			free(setter);
+			delete [] setter;
 		return MOD_CONT;
 	}
 
 	if (check_topiclock(c, topic_time)) {
 		if (setter)
-			free(setter);
+			delete [] setter;
 		return MOD_CONT;
 	}
 
 	if (c->topic) {
-		free(c->topic);
+		delete [] c->topic;
 		c->topic = NULL;
 	}
 	if (ac > 1 && *av[3])
@@ -830,7 +830,7 @@ int anope_event_tburst(const char *source, int ac, const char **av)
 
 	record_topic(av[0]);
 	if (setter)
-		free(setter);
+		delete [] setter;
 	return MOD_CONT;
 }
 
@@ -1044,7 +1044,7 @@ int anope_event_capab(const char *source, int ac, const char **av)
 
 	/* Free our built ac/av */
 	for (argvsize = 0; argvsize < argc; argvsize++) {
-		free((char *)argv[argvsize]);
+		delete [] argv[argvsize];
 	}
 	free((char **)argv);
 
@@ -1083,9 +1083,9 @@ int anope_event_bmask(const char *source, int ac, const char **av)
 				add_invite(c, b);
 			}
 			if (b)
-				free(b);
+				delete [] b;
 		}
-		free(bans);
+		delete [] bans;
 	}
 	return MOD_CONT;
 }
@@ -1172,7 +1172,7 @@ class ProtoRatbox : public Module
 
 	~ProtoRatbox()
 	{
-		free(TS6SID);
+		delete [] TS6SID;
 	}
 
 };
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index c0ee75c6c..74bafd0f9 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1281,9 +1281,9 @@ int anope_event_server(const char *source, int ac, const char **av)
 		upnumeric = myStrGetToken(vl, '-', 2);
 		desc = myStrGetTokenRemainder(av[2], ' ', 1);
 		do_server(source, av[0], av[1], desc, upnumeric);
-		Anope_Free(vl);
-		Anope_Free(desc);
-		Anope_Free(upnumeric);
+		delete [] vl;
+		delete [] desc;
+		delete [] upnumeric;
 	} else {
 		do_server(source, av[0], av[1], av[2], NULL);
 	}