From: Automerge script <automerge@asterisk.org>
Date: Thu, 13 Apr 2006 16:06:43 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.7.1-netsec~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b64b6ef1f79b2b9a9691452a430389b46f63cfe0;p=thirdparty%2Fasterisk.git

automerge commit

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

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) {