projects
/
asterisk/asterisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
88a49f7
)
Fix callerid segfault in rare combination (bug #3519)
author
Mark Spencer
<markster@digium.com>
Mon, 7 Feb 2005 14:56:43 +0000
(14:56 +0000)
committer
Mark Spencer
<markster@digium.com>
Mon, 7 Feb 2005 14:56:43 +0000
(14:56 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4980
65c4cc65
-6c06-0410-ace0-
fbb531ad65f3
channels/chan_sip.c
patch
|
blob
|
history
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) {