aboutsummaryrefslogtreecommitdiff
path: root/src/ejabberd_config.erl
diff options
context:
space:
mode:
authorEvgeny Khramtsov <ekhramtsov@process-one.net>2019-02-19 12:31:18 +0300
committerEvgeny Khramtsov <ekhramtsov@process-one.net>2019-02-19 12:31:18 +0300
commit8def827f9cc1242e15af760bdd8419ddd167e3a6 (patch)
treee3f734b2124157faa452ddbc7fa754d36700ad67 /src/ejabberd_config.erl
parentDon't perform roster push for non-local contacts in mod_shared_roster (diff)
Don't crash on malformed 'modules' section
Diffstat (limited to 'src/ejabberd_config.erl')
-rw-r--r--src/ejabberd_config.erl14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index eaf513e77..ed52c728b 100644
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -713,10 +713,16 @@ process_term(Term, State) ->
process_host_term(Term, Host, State, Action) ->
case Term of
- {modules, Modules} when Action == set ->
- set_option({modules, Host}, replace_modules(Modules), State);
- {modules, Modules} when Action == append ->
- append_option({modules, Host}, replace_modules(Modules), State);
+ {modules, Modules} ->
+ Modules1 = try (gen_mod:opt_type(modules))(Modules) of
+ _ -> replace_modules(Modules)
+ catch _:_ -> Modules
+ end,
+ if Action == set ->
+ set_option({modules, Host}, Modules1, State);
+ Action == append ->
+ append_option({modules, Host}, Modules1, State)
+ end;
{host, _} ->
State;
{hosts, _} ->