summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2005-05-09 20:14:03 +0000
committergeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2005-05-09 20:14:03 +0000
commit6760f98c6b0e6bc01b0050c15fec4606e7661904 (patch)
treef5e7a2a0f228a76408c15929d9629063c6b9e1f1
parent6825c4c6dc0e88df7647275852227fcdc9f63b45 (diff)
BUILD : 1.7.9 (784) BUGS : NOTES : Fixed another segfault in ns_maxemail, forget a check for nc->email this time.
git-svn-id: svn://svn.anope.org/anope/trunk@784 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@544 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes1
-rw-r--r--src/config.c2
-rw-r--r--src/modules/ns_maxemail.c3
-rw-r--r--version.log6
4 files changed, 8 insertions, 4 deletions
diff --git a/Changes b/Changes
index 6613abda7..7aeeb04ba 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
Anope Version S V N
-------------------
+05/09 F Segfault in ns_maxemail when user's email not set. [ #00]
05/06 F Compiler warnings when using make strict. [ #00]
05/06 F Segfault in os_clearmodes when chan had invites (+I) set. [#357]
05/06 F Identified founders are now logged out if the channel is dropped. [#364]
diff --git a/src/config.c b/src/config.c
index b6f0816e3..7bf44b358 100644
--- a/src/config.c
+++ b/src/config.c
@@ -858,7 +858,7 @@ int parse(char *buf, int linenum, int reload)
if (n == lenof(directives)) {
/* error(linenum, "Unknown directive `%s'", dir);
- return 1; *//* don't cause abort */
+ return 1; *//* don't cause abort */
}
return retval;
diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c
index 12f7be635..c17b7962d 100644
--- a/src/modules/ns_maxemail.c
+++ b/src/modules/ns_maxemail.c
@@ -82,8 +82,7 @@ int count_email_in_use(char *email, User * u)
for (i = 0; i < 1024; i++) {
for (nc = nclists[i]; nc; nc = nc->next) {
- if (!(u->na && u->na->nc && u->na->nc == nc)
- && (stricmp(nc->email, email) == 0))
+ if (!(u->na && u->na->nc && (u->na->nc == nc)) && nc->email && (stricmp(nc->email, email) == 0))
count++;
}
}
diff --git a/version.log b/version.log
index fb7777f2d..fd0e6a1de 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="9"
-VERSION_BUILD="783"
+VERSION_BUILD="784"
# $Log$
#
+# BUILD : 1.7.9 (784)
+# BUGS :
+# NOTES : Fixed another segfault in ns_maxemail, forget a check for nc->email this time.
+#
# BUILD : 1.7.9 (783)
# BUGS :
# NOTES : Fixed most compiler warnings for the core (not modules) when using make strict