summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorDavid M. Lee <dlee@digium.com>2014-12-12 15:03:16 +0000
committerDavid M. Lee <dlee@digium.com>2014-12-12 15:03:16 +0000
commit2e6d2b148496c43ffaafd6c8c463f77749d3feee (patch)
treefbb27260f6a07940b346722320e7d7c1de49f280 /res
parenta6cf13f2e9c2b485194b22059dc739b04472ab98 (diff)
Fix crash for sorcery misconfigs
res_pjsip_outbound_publish was missing the CHECK_PJSIP_MODULE_LOADED() call in load_module, and would crash with a segfault if res_pjsip declined to load. Review: https://reviewboard.asterisk.org/r/4258/ ........ Merged revisions 429457 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429458 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_pjsip_outbound_publish.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_pjsip_outbound_publish.c b/res/res_pjsip_outbound_publish.c
index 323324d60..c79e42847 100644
--- a/res/res_pjsip_outbound_publish.c
+++ b/res/res_pjsip_outbound_publish.c
@@ -1087,6 +1087,8 @@ static int outbound_auth_handler(const struct aco_option *opt, struct ast_variab
static int load_module(void)
{
+ CHECK_PJSIP_MODULE_LOADED();
+
ast_sorcery_apply_config(ast_sip_get_sorcery(), "res_pjsip_outbound_publish");
ast_sorcery_apply_default(ast_sip_get_sorcery(), "outbound-publish", "config", "pjsip.conf,criteria=type=outbound-publish");