aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-03 15:37:58 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-03 15:37:58 +0000
commite1d1a102b26f91d48ad4ec8ce00b4c8132cf5c75 (patch)
tree2640e8643a0682ddbf8ab0ca9fdfe5d42e042385
parentb8c751dff51e0b9685ed06a39d5248969c9fa7a3 (diff)
Merged revisions 227167 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r227167 | file | 2009-11-03 11:37:08 -0400 (Tue, 03 Nov 2009) | 12 lines Merged revisions 227166 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r227166 | file | 2009-11-03 11:36:16 -0400 (Tue, 03 Nov 2009) | 5 lines Fix a bug where an RPID header could be generated with a blank username in the URI. (closes issue #15909) Reported by: kobaz ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@227168 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a89570110..2ea85b40d 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9198,7 +9198,7 @@ static void build_rpid(struct sip_pvt *p)
if (!ast_strlen_zero(p->rpid) || !ast_strlen_zero(p->rpid_from))
return;
- if (p->owner && p->owner->cid.cid_num)
+ if (p->owner && !ast_strlen_zero(p->owner->cid.cid_num))
clid = p->owner->cid.cid_num;
if (p->owner && p->owner->cid.cid_name)
clin = p->owner->cid.cid_name;