summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2013-05-25 15:26:20 -0400
committerAdam <Adam@anope.org>2013-05-25 15:39:40 -0400
commitec9931288b719cfe9aaa9f1547108d7c097006e2 (patch)
tree5af9e817f1995e86524bf02518a6920e43783cec
parent71ec1a93dd71c12ef1c0bbf0f7beb7eb33b96058 (diff)
Allow loading nicks with no core... just in case
-rw-r--r--src/nickserv.c6
-rw-r--r--version.log2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/nickserv.c b/src/nickserv.c
index 82bc7b488..9328cd261 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -697,6 +697,12 @@ void load_ns_dbase(void)
na->nc = findcore(s);
free(s);
+ if (!na->nc)
+ {
+ free(na);
+ continue;
+ }
+
slist_add(&na->nc->aliases, na);
if (!(na->status & NS_VERBOTEN)) {
diff --git a/version.log b/version.log
index a9daf5574..16b072da1 100644
--- a/version.log
+++ b/version.log
@@ -8,7 +8,7 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="9"
VERSION_EXTRA="-git"
-VERSION_BUILD="3113"
+VERSION_BUILD="3114"
# Changes since 1.8.8 Release