Fix callerid segfault in rare combination (bug #3519)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4980 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d168e28..24af559 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3746,7 +3746,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, char *cmd, c
                l = p->owner->cid.cid_num;
                n = p->owner->cid.cid_name;
        }
-       if ((!l || !ast_isphonenumber(l)) && default_callerid[0])
+       if (!l || (!ast_isphonenumber(l) && default_callerid[0]))
                        l = default_callerid;
        /* if user want's his callerid restricted */
        if (p->callingpres & AST_PRES_PROHIB_USER_NUMBER_NOT_SCREENED) {