diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-03 15:40:34 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-03 15:40:34 +0000 |
| commit | 559de6daa87d7b4607c524f8ee4d70eb2971cf45 (patch) | |
| tree | 0bc37323208e3a74488b3478ba88b78e0b3bbd8c | |
| parent | 2b168be4cc4f8a37253ab9a82c7fcfafa67375b3 (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.2@227170 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7b22b33d9..5b4c10612 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10420,7 +10420,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; |