git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4474 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Jeremy McNamara 21 years ago
parent d2f64f963d
commit d999f80dbe

@ -807,12 +807,12 @@ static struct ast_channel *oh323_new(struct oh323_pvt *pvt, int state, const cha
} }
if (!ast_strlen_zero(pvt->cid_num)) { if (!ast_strlen_zero(pvt->cid_num)) {
ch->cid.cid_num = strdup(pvt->cid_num); ch->cid.cid_num = strdup(pvt->cid_num);
} else if (!ast_strlen_zero(pvt->cd.call_source_e164)) { } else if (pvt->cd.call_source_e164 && !ast_strlen_zero(pvt->cd.call_source_e164)) {
ch->cid.cid_num = strdup(pvt->cd.call_source_e164); ch->cid.cid_num = strdup(pvt->cd.call_source_e164);
} }
if (!ast_strlen_zero(pvt->cid_name)) { if (!ast_strlen_zero(pvt->cid_name)) {
ch->cid.cid_name = strdup(pvt->cid_name); ch->cid.cid_name = strdup(pvt->cid_name);
} else if (!ast_strlen_zero(pvt->cd.call_source_name)) { } else if (pvt->cd.call_source_e164 && !ast_strlen_zero(pvt->cd.call_source_name)) {
ch->cid.cid_name = strdup(pvt->cd.call_source_name); ch->cid.cid_name = strdup(pvt->cd.call_source_name);
} }
if (!ast_strlen_zero(pvt->rdnis)) { if (!ast_strlen_zero(pvt->rdnis)) {

Loading…
Cancel
Save