mirror of
https://github.com/asterisk/asterisk.git
synced 2026-07-07 07:09:17 -07:00
Merged revisions 7665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r7665 | russell | 2005-12-28 12:35:56 -0500 (Wed, 28 Dec 2005) | 2 lines fix memory leak in build_rpid (issue #6070) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
+4
-7
@@ -4628,13 +4628,10 @@ static void build_rpid(struct sip_pvt *p)
|
||||
if (p->rpid || p->rpid_from)
|
||||
return;
|
||||
|
||||
if (p->owner && p->owner->cid.cid_num) {
|
||||
clid = strdup(p->owner->cid.cid_num);
|
||||
}
|
||||
|
||||
if (p->owner && p->owner->cid.cid_name) {
|
||||
clin = strdup(p->owner->cid.cid_name);
|
||||
}
|
||||
if (p->owner && 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;
|
||||
if (ast_strlen_zero(clin))
|
||||
clin = clid;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user