BUILD : 1.7.0 (38) BUGS : 008 NOTES : Fixed segfault due to coreless nicks in MySQL db on behalf of Keeper

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


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

3 files changed, 10 insertions, 3 deletions

diff --git a/Changes b/Changes
index 3d2082d67..a3882c05f 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 Anope Version 1.7.0
 --------------------
 Provided by Anope Dev. <dev@anope.org>
+2004/04/09 Fixed segfault due to coreless nicks in MySQL db (Bug #8)
 2004/04/08 Added NickRegDelay. Nicks have to be connected longer than X seconds before a /ns register.
 2004/04/08 Added "is a services root administrator" to /ns info.
 2004/04/08 Added option for SOs and above to hide their services access status in /ns info.
diff --git a/mysql.c b/mysql.c
index ff23c0b5f..6ce3bc1ce 100644
--- a/mysql.c
+++ b/mysql.c
@@ -1570,7 +1570,8 @@ void db_mysql_load_ns_dbase(void)
         na->nc = findcore(tmpstr);
         free(tmpstr);
 
-        slist_add(&na->nc->aliases, na);
+        if (na->nc)
+            slist_add(&na->nc->aliases, na);
 
         if (!(na->status & NS_VERBOTEN)) {
             if (!na->last_usermask)
@@ -1579,7 +1580,8 @@ void db_mysql_load_ns_dbase(void)
                 na->last_realname = sstrdup("");
         }
 
-        na->nc->flags &= ~NI_SERVICES_ROOT;
+        if (na->nc)
+            na->nc->flags &= ~NI_SERVICES_ROOT;
         alpha_insert_alias(na);
     }
     mysql_free_result(mysql_res);
diff --git a/version.log b/version.log
index 09ddf16a0..b03498e8e 100644
--- a/version.log
+++ b/version.log
@@ -8,11 +8,15 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="0"
-VERSION_BUILD="37"
+VERSION_BUILD="38"
 VERSION_EXTRA=""
 
 # $Log$
 #
+# BUILD : 1.7.0 (38)
+# BUGS  : 008
+# NOTES : Fixed segfault due to coreless nicks in MySQL db on behalf of Keeper
+#
 # BUILD : 1.7.0 (37)
 # BUGS  : 
 # NOTES : Added NickRegDelay which prevents users from regging their nick if they are not connected for at least X seconds.