From 9a13dc9d99f24f77ca9047819d1646b350c32407 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 13 Apr 2006 15:56:35 +0000
Subject: [PATCH] Bug 6957 - variable names beginning with CALLERID weren't
 substituted correctly

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@19768 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 pbx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pbx.c b/pbx.c
index 96707fad64..9ef1c1936e 100644
--- a/pbx.c
+++ b/pbx.c
@@ -1023,7 +1023,8 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c
 						*ret = workspace;
 					} else
 						*ret = NULL;
-				}
+				} else
+					goto icky;
 			} else if (!strcmp(var + 6, "ANI")) {
 				/* CALLERANI */
 				if (c->cid.cid_ani) {