summaryrefslogtreecommitdiff
path: root/src/config.c
diff options
context:
space:
mode:
authormokkori <brezelzombie@live.de>2013-02-17 16:08:51 +0100
committerAdam <Adam@anope.org>2013-07-25 19:42:18 -0400
commitd2d89ac412dbdba0747e44cdf1e4c90e29f6ef2b (patch)
tree26a48c6e90a6eb02ba6326864c87879b810d00f2 /src/config.c
parente090eaea65efdac33539d80317a9370c04681301 (diff)
Memory: Properly initialize and free new module languages.
Memory: Properly free strings in module config directive lookups. Memory: Do not leak module version and author in rare situations. Memory: Memory leak when deleting a module callback. Memory: Memory leaks with module messages. Memory: Memory leaks with module commands. Memory: Memory leaks with module event handlers. Memory: Memory leaks with module event hooks. Memory: Every module config entry of type string is leaked on config reload. Memory: Leak services root list, ulines list, host setters list, modules autoload list, modules delayed autoload list, hostserv/memoserv/helpserv/botserv/operserv/chanserv/nickserv core modules lists on config reload. Memory: Leaks with channel bans/invites/exceptions. Memory: Leak when updating already existing ignore. Memory: Invalid pointer read in slists. Memory: Leak when using /cs appendtopic. Memory: Leak on (currently impossible) config reload. Memory: Syscall param write(buf) points to uninitialised byte(s) in save_ns_dbase(). Memory: Leak if PreNickServDB is set and NSEmailReg is not. Removing a command no longer calls free() on help_param*, reversed previous changes Changes to CSMaxReg, MSMaxMemos and NewsCount are now properly reflected in help notices after config reload Small adjustments Fixed copy&paste mistake Fix findCommand() searching in the wrong command tables
Diffstat (limited to 'src/config.c')
-rw-r--r--src/config.c90
1 files changed, 59 insertions, 31 deletions
diff --git a/src/config.c b/src/config.c
index 7e56996b4..bb43e7d81 100644
--- a/src/config.c
+++ b/src/config.c
@@ -220,7 +220,7 @@ char *GlobalOnCycleMessage;
char *GlobalOnCycleUP;
char *ServicesRoot;
char **ServicesRoots;
-int RootNumber;
+int RootNumber = 0;
int SuperAdmin;
int LogBot;
int LogMaxUsers;
@@ -272,8 +272,8 @@ int OSOpersOnly;
char *Modules;
char *ModulesDelayed;
char **ModulesAutoload;
-int ModulesNumber;
-int ModulesDelayedNumber;
+int ModulesNumber = 0;
+int ModulesDelayedNumber = 0;
char **ModulesDelayedAutoload;
/**
@@ -281,31 +281,31 @@ char **ModulesDelayedAutoload;
**/
char *HostCoreModules;
char **HostServCoreModules;
-int HostServCoreNumber;
+int HostServCoreNumber = 0;
char *MemoCoreModules;
char **MemoServCoreModules;
-int MemoServCoreNumber;
+int MemoServCoreNumber = 0;
char *HelpCoreModules;
char **HelpServCoreModules;
-int HelpServCoreNumber;
+int HelpServCoreNumber = 0;
char *BotCoreModules;
char **BotServCoreModules;
-int BotServCoreNumber;
+int BotServCoreNumber = 0;
char *OperCoreModules;
char **OperServCoreModules;
-int OperServCoreNumber;
+int OperServCoreNumber = 0;
char *NickCoreModules;
char **NickServCoreModules;
-int NickServCoreNumber;
+int NickServCoreNumber = 0;
char *ChanCoreModules;
char **ChanServCoreModules;
-int ChanServCoreNumber;
+int ChanServCoreNumber = 0;
char *MysqlHost;
@@ -346,7 +346,7 @@ int UnRestrictSAdmin;
char *UlineServers;
char **Ulines;
-int NumUlines;
+int NumUlines = 0;
int UseTS6;
@@ -774,8 +774,7 @@ int parse_directive(Directive * d, char *dir, int ac, char *av[MAXPARAMS],
*(int *) d->params[i].ptr = val;
break;
case PARAM_STRING:
-/* if (reload && *(char **)d->params[i].ptr)
- free(*(char **)d->params[i].ptr); */
+ Anope_Free(*(char **)d->params[i].ptr);
*(char **) d->params[i].ptr = sstrdup(av[optind++]);
if (!d->params[i].ptr) {
error(linenum, "%s: Out of memory", d->name);
@@ -1247,7 +1246,8 @@ int read_config(int reload)
/* Services Root building */
if (ServicesRoot && !reload) { /* Check to prevent segmentation fault if it's missing */
- RootNumber = 0;
+ while( RootNumber )
+ free(ServicesRoots[--RootNumber]);
s = strtok(ServicesRoot, " ");
do {
@@ -1268,7 +1268,8 @@ int read_config(int reload)
/* Ulines */
if (UlineServers) {
- NumUlines = 0;
+ while( NumUlines )
+ free(Ulines[--NumUlines]);
s = strtok(UlineServers, " ");
do {
@@ -1281,30 +1282,56 @@ int read_config(int reload)
}
/* Host Setters building... :P */
+ while( HostNumber )
+ free(HostSetters[--HostNumber]);
+ Anope_Free(HostSetters);
HostSetters = buildStringList(HostSetter, &HostNumber);
/* Modules Autoload building... :P */
+ while( ModulesNumber )
+ free(ModulesAutoload[--ModulesNumber]);
+ Anope_Free(ModulesAutoload);
ModulesAutoload = buildStringList(Modules, &ModulesNumber);
- ModulesDelayedAutoload =
- buildStringList(ModulesDelayed, &ModulesDelayedNumber);
- HostServCoreModules =
- buildStringList(HostCoreModules, &HostServCoreNumber);
- MemoServCoreModules =
- buildStringList(MemoCoreModules, &MemoServCoreNumber);
- HelpServCoreModules =
- buildStringList(HelpCoreModules, &HelpServCoreNumber);
- BotServCoreModules =
- buildStringList(BotCoreModules, &BotServCoreNumber);
+ while( ModulesDelayedNumber )
+ free(ModulesDelayedAutoload[--ModulesDelayedNumber]);
+ Anope_Free(ModulesDelayedAutoload);
+ ModulesDelayedAutoload = buildStringList(ModulesDelayed, &ModulesDelayedNumber);
- OperServCoreModules =
- buildStringList(OperCoreModules, &OperServCoreNumber);
+ while( HostServCoreNumber )
+ free(HostServCoreModules[--HostServCoreNumber]);
+ Anope_Free(HostServCoreModules);
+ HostServCoreModules = buildStringList(HostCoreModules, &HostServCoreNumber);
- ChanServCoreModules =
- buildStringList(ChanCoreModules, &ChanServCoreNumber);
+ while( MemoServCoreNumber )
+ free(MemoServCoreModules[--MemoServCoreNumber]);
+ Anope_Free(MemoServCoreModules);
+ MemoServCoreModules = buildStringList(MemoCoreModules, &MemoServCoreNumber);
- NickServCoreModules =
- buildStringList(NickCoreModules, &NickServCoreNumber);
+ while( HelpServCoreNumber )
+ free(HelpServCoreModules[--HelpServCoreNumber]);
+ Anope_Free(HelpServCoreModules);
+ HelpServCoreModules = buildStringList(HelpCoreModules, &HelpServCoreNumber);
+
+ while( BotServCoreNumber )
+ free(BotServCoreModules[--BotServCoreNumber]);
+ Anope_Free(BotServCoreModules);
+ BotServCoreModules = buildStringList(BotCoreModules, &BotServCoreNumber);
+
+ while( OperServCoreNumber )
+ free(OperServCoreModules[--OperServCoreNumber]);
+ Anope_Free(OperServCoreModules);
+ OperServCoreModules = buildStringList(OperCoreModules, &OperServCoreNumber);
+
+ while( ChanServCoreNumber )
+ free(ChanServCoreModules[--ChanServCoreNumber]);
+ Anope_Free(ChanServCoreModules);
+ ChanServCoreModules = buildStringList(ChanCoreModules, &ChanServCoreNumber);
+
+ while( NickServCoreNumber )
+ free(NickServCoreModules[--NickServCoreNumber]);
+ Anope_Free(NickServCoreModules);
+ NickServCoreModules = buildStringList(NickCoreModules, &NickServCoreNumber);
if (LimitSessions) {
@@ -1413,6 +1440,7 @@ int read_config(int reload)
CHECK(UseMail);
CHECK(NSForceEmail);
} else {
+ Anope_Free(PreNickDBName);
PreNickDBName = NULL;
NSRExpire = 0;
}