From 5df647306749f30be8a6f0020807985c2c9476ba Mon Sep 17 00:00:00 2001 From: Alexandr Anikin <may@telecom-service.ru> Date: Sun, 25 Apr 2010 18:51:37 +0000 Subject: [PATCH] additional checking related to issue 17186 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@258855 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- addons/chan_ooh323.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index 7d4a46f1c1..fdb2dfc93d 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -1882,10 +1882,10 @@ int onNewCallCreated(ooCallData *call) } ast_mutex_lock(&p->lock); - if (p->callerid_name) { + if (!ast_strlen_zero(p->callerid_name)) { ooCallSetCallerId(call, p->callerid_name); } - if (p->callerid_num) { + if (!ast_strlen_zero(p->callerid_num)) { i = 0; while (*(p->callerid_num + i) != '\0') { if(!isdigit(*(p->callerid_num+i))) { break; } @@ -1894,7 +1894,7 @@ int onNewCallCreated(ooCallData *call) if(*(p->callerid_num+i) == '\0') ooCallSetCallingPartyNumber(call, p->callerid_num); else { - if(!p->callerid_name) + if(ast_strlen_zero(p->callerid_name)) ooCallSetCallerId(call, p->callerid_num); } } -- GitLab