summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes1
-rw-r--r--src/commands.c2
-rw-r--r--version.log6
3 files changed, 8 insertions, 1 deletions
diff --git a/Changes b/Changes
index 1c686fbbd..b68b40694 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ Anope Version S V N
Provided by Anope Dev. <dev@anope.org> - 2006
08/09 F Fixed port checking when using command line switches. [#575]
08/14 F Fixed db_mysql_query for better robustness. [#585]
+08/27 F Fixed mod_current_module being incorrect resulting in segfault. [#593]
Provided by Trystan <trystan@nomadirc.net> - 2006
08/20 F Fixed several compiler warnings. [#586]
diff --git a/src/commands.c b/src/commands.c
index 0159ee312..97603cc19 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -96,6 +96,7 @@ void do_run_cmd(char *service, User * u, Command * c, const char *cmd)
}
} else {
mod_current_module_name = c->mod_name;
+ mod_current_module = NULL;
if ((c->has_priv == NULL) || c->has_priv(u)) {
retVal = c->routine(u);
mod_current_module_name = NULL;
@@ -103,6 +104,7 @@ void do_run_cmd(char *service, User * u, Command * c, const char *cmd)
current = c->next;
while (current && retVal == MOD_CONT) {
mod_current_module_name = current->mod_name;
+ mod_current_module = NULL;
retVal = current->routine(u);
mod_current_module_name = NULL;
current = current->next;
diff --git a/version.log b/version.log
index fd40afb34..d207062a1 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="15"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1142"
+VERSION_BUILD="1143"
# $Log$
#
+# BUILD : 1.7.15 (1143)
+# BUGS : 593
+# NOTES : Fixed mod_current_module not always NULL-ified in mod_run_cmd, resulting in weird segfaults in special situations
+#
# BUILD : 1.7.15 (1142)
# BUGS : N/A
# NOTES : Dont let hybrid send EOBs since we told it we dont suppor them anymore