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 96707fad64f650777778c259ea22762c80d7cd70..9ef1c1936e2dc5c89c7bb690f94f7643c91d512d 100644 (file)
--- 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) {