From: Mark Michelson Date: Mon, 13 Aug 2012 20:02:41 +0000 (+0000) Subject: Fix problem where incorrect pointer was checked for nullity. X-Git-Tag: 13.0.0-beta1~2641 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d02d8e01613b34f5a253916e4f0168010622f26;p=thirdparty%2Fasterisk.git Fix problem where incorrect pointer was checked for nullity. ........ Merged revisions 371198 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 371199 from http://svn.asterisk.org/svn/asterisk/branches/10 ........ Merged revisions 371200 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@371202 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7569bba11e..252e87d342 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -16634,7 +16634,7 @@ static int get_rdnis(struct sip_pvt *p, struct sip_request *oreq, char **name, c pbx_builtin_setvar_helper(p->owner, "__SIPRDNISDOMAIN", rdomain); if (sip_debug_test_pvt(p)) - ast_verbose("RDNIS for this call is %s (reason %s)\n", exten, reason ? reason_param : ""); + ast_verbose("RDNIS for this call is %s (reason %s)\n", exten, S_OR(reason_param, "")); /*ast_string_field_set(p, rdnis, rexten);*/