[asterisk-commits] dlee: trunk r429458 - in /trunk: ./ res/res_pjsip_outbound_publish.c

[SVN commits to the Asterisk project]

Author: dlee
Date: Fri Dec 12 09:03:16 2014
New Revision: 429458

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429458
Log:
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

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_outbound_publish.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/res_pjsip_outbound_publish.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_outbound_publish.c?view=diff&rev=429458&r1=429457&r2=429458
==============================================================================
--- trunk/res/res_pjsip_outbound_publish.c (original)
+++ trunk/res/res_pjsip_outbound_publish.c Fri Dec 12 09:03:16 2014
@@ -1087,6 +1087,8 @@
 
 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");