X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/63c95a478af1b51ad021abef19f630de189f0229..35305a49c0973c0e29e4a607c2b507a2d8face43:/src/spamserv.c

diff --git a/src/spamserv.c b/src/spamserv.c
index ad4acd4..a8e0a8b 100644
--- a/src/spamserv.c
+++ b/src/spamserv.c
@@ -729,6 +729,9 @@ timeq_flood(UNUSED_ARG(void *data))
 	{
 		uInfo = iter_data(it);
 
+                if (!uInfo)
+                    continue;
+
 		if(!(fNode = uInfo->flood))
 			continue;
 
@@ -2104,6 +2107,7 @@ spamserv_saxdb_read(struct dict *database)
 		}
 
 		channel = GetChannel(iter_key(it));
+
 		strlist = database_get_data(hir->d.object, KEY_EXCEPTIONS, RECDB_STRING_LIST);
 		strlist2 = database_get_data(hir->d.object, KEY_BADWORDS, RECDB_STRING_LIST);
 
@@ -2283,6 +2287,8 @@ init_spamserv(const char *nick)
 	connected_users_dict = dict_new();
 	killed_users_dict = dict_new();
 
+	saxdb_register("SpamServ", spamserv_saxdb_read, spamserv_saxdb_write);
+
 	reg_new_user_func(spamserv_new_user_func);
 	reg_del_user_func(spamserv_del_user_func);
 	reg_nick_change_func(spamserv_nick_change_func);
@@ -2328,7 +2334,6 @@ init_spamserv(const char *nick)
             }
         }
 
-	saxdb_register("SpamServ", spamserv_saxdb_read, spamserv_saxdb_write);
 	reg_exit_func(spamserv_db_cleanup);
 	message_register_table(msgtab);
 	crc32_init();