Author: file Date: Sat Feb 14 12:21:02 2015 New Revision: 431753 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431753 Log: Multiple revisions 431751-431752
........ r431751 | file | 2015-02-14 14:19:07 -0400 (Sat, 14 Feb 2015) | 5 lines chan_pjsip: Fix crash when CHANNEL dialplan function is invoked with pjsip argument and no type. ASTERISK-24771 #close Reported by: Niklas Larsson ........ r431752 | file | 2015-02-14 14:20:27 -0400 (Sat, 14 Feb 2015) | 2 lines 'information' ends with an 'n'. ........ Merged revisions 431751-431752 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/channels/pjsip/dialplan_functions.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/channels/pjsip/dialplan_functions.c URL: http://svnview.digium.com/svn/asterisk/trunk/channels/pjsip/dialplan_functions.c?view=diff&rev=431753&r1=431752&r2=431753 ============================================================================== --- trunk/channels/pjsip/dialplan_functions.c (original) +++ trunk/channels/pjsip/dialplan_functions.c Sat Feb 14 12:21:02 2015 @@ -591,7 +591,10 @@ dlg = channel->session->inv_session->dlg; - if (!strcmp(type, "secure")) { + if (ast_strlen_zero(type)) { + ast_log(LOG_WARNING, "You must supply a type field for 'pjsip' information\n"); + return -1; + } else if (!strcmp(type, "secure")) { #ifdef HAVE_PJSIP_GET_DEST_INFO pjsip_host_info dest; pj_pool_t *pool = pjsip_endpt_create_pool(ast_sip_get_pjsip_endpoint(), "secure-check", 128, 128); -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
