]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix problem where incorrect pointer was checked for nullity.
authorMark Michelson <mmichelson@digium.com>
Mon, 13 Aug 2012 20:02:41 +0000 (20:02 +0000)
committerMark Michelson <mmichelson@digium.com>
Mon, 13 Aug 2012 20:02:41 +0000 (20:02 +0000)
........

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

channels/chan_sip.c

index 7569bba11eaa6bef2d855222030f02996cab801b..252e87d3421ae6e299a8ac313318a686c990aeeb 100644 (file)
@@ -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);*/