From: Mark Spencer <markster@digium.com>
Date: Thu, 10 Feb 2005 16:38:39 +0000 (+0000)
Subject: Fix (in an admittedly icky way) the CALL variable broken issues (bug #3549)
X-Git-Tag: 1.2.0-beta1~1230
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ed0a01068b33669829cc29efaeb96ba118d3cea;p=thirdparty%2Fasterisk.git

Fix (in an admittedly icky way) the CALL variable broken issues (bug #3549)


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

diff --git a/pbx.c b/pbx.c
index cbe9a5f022..30b6866fb9 100755
--- a/pbx.c
+++ b/pbx.c
@@ -920,7 +920,8 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c
 				snprintf(workspace, workspacelen, "%d", c->cid.cid_tns);
 				*ret = workspace;
 			}
-		}
+		} else
+			goto icky;
 	} else if (c && !strcmp(var, "DNID")) {
 		if (c->cid.cid_dnid) {
 			strncpy(workspace, c->cid.cid_dnid, workspacelen - 1);
@@ -996,6 +997,7 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c
 		strncpy(workspace, c->language, workspacelen - 1);
 		*ret = workspace;
 	} else {
+icky:
 		if (headp) {
 			AST_LIST_TRAVERSE(headp,variables,entries) {
 #if 0