From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 18 Apr 2008 15:24:09 +0000 (+0000)
Subject: Ensure that we don't ast_strdupa(NULL)
X-Git-Tag: 1.4.20-rc1~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de529ba5f7a0a27d7804175c6d71d25638fd83fc;p=thirdparty%2Fasterisk.git

Ensure that we don't ast_strdupa(NULL)
(closes issue #12476)
Reported by: davidw
Patch by me


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@114248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 66c3224c9a..ae6d093c79 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -1500,7 +1500,7 @@ static int action_agents(struct mansession *s, const struct message *m)
 			loginChan = ast_strdupa(p->chan->name);
 			if (p->owner && p->owner->_bridge) {
 				if (ast_bridged_channel(p->owner)) {
-					talkingtoChan = ast_strdupa(ast_bridged_channel(p->owner)->cid.cid_num);
+					talkingtoChan = ast_strdupa(S_OR(ast_bridged_channel(p->owner)->cid.cid_num, ""));
 				} else {
 					talkingtoChan = "n/a";
 				}