mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-16 14:58:25 +00:00
additional checking related to issue 17186
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@258855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1882,10 +1882,10 @@ int onNewCallCreated(ooCallData *call)
|
|||||||
}
|
}
|
||||||
ast_mutex_lock(&p->lock);
|
ast_mutex_lock(&p->lock);
|
||||||
|
|
||||||
if (p->callerid_name) {
|
if (!ast_strlen_zero(p->callerid_name)) {
|
||||||
ooCallSetCallerId(call, p->callerid_name);
|
ooCallSetCallerId(call, p->callerid_name);
|
||||||
}
|
}
|
||||||
if (p->callerid_num) {
|
if (!ast_strlen_zero(p->callerid_num)) {
|
||||||
i = 0;
|
i = 0;
|
||||||
while (*(p->callerid_num + i) != '\0') {
|
while (*(p->callerid_num + i) != '\0') {
|
||||||
if(!isdigit(*(p->callerid_num+i))) { break; }
|
if(!isdigit(*(p->callerid_num+i))) { break; }
|
||||||
@@ -1894,7 +1894,7 @@ int onNewCallCreated(ooCallData *call)
|
|||||||
if(*(p->callerid_num+i) == '\0')
|
if(*(p->callerid_num+i) == '\0')
|
||||||
ooCallSetCallingPartyNumber(call, p->callerid_num);
|
ooCallSetCallingPartyNumber(call, p->callerid_num);
|
||||||
else {
|
else {
|
||||||
if(!p->callerid_name)
|
if(ast_strlen_zero(p->callerid_name))
|
||||||
ooCallSetCallerId(call, p->callerid_num);
|
ooCallSetCallerId(call, p->callerid_num);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user