diff options
| author | George Joseph <gjoseph@digium.com> | 2017-06-13 10:33:34 -0600 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2017-06-15 18:33:43 -0600 |
| commit | dd1fe3436e3ae6caad8835e873f8841839a2ed32 (patch) | |
| tree | 1a6cde6efc1755b2dec797f2ffba68c77a12088e /res/res_ari_asterisk.c | |
| parent | f2e0160a71a2f4a15a6033202fe6a78bb14a02eb (diff) | |
res_ari: Add "module loaded" check to ari stubs
The recent change to make the use of LOAD_DECLINE more consistent
caused res_ari to unload itself before declining if the ari.conf
file wasn't found. The ari stubs though still tried to use the
configuration resulting in segfaults.
This patch creates a new CHECK_ARI_MODULE_LOADED macro which tests
to see if res_ari is actually loaded and causes the stubs to also
decline if it isn't. The macro was then added to the mustache
template's "load_module" function.
ASTERISK-27026 #close
Reported-by: Ronald Raikes
Change-Id: I263d56efa628ee3c411bdcd16d49af6260c6c91d
Diffstat (limited to 'res/res_ari_asterisk.c')
| -rw-r--r-- | res/res_ari_asterisk.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c index f81f647b1..9064e7bec 100644 --- a/res/res_ari_asterisk.c +++ b/res/res_ari_asterisk.c @@ -1223,6 +1223,10 @@ static int unload_module(void) static int load_module(void) { int res = 0; + + CHECK_ARI_MODULE_LOADED(); + + stasis_app_ref(); res |= ast_ari_add_handler(&asterisk); if (res) { |