Fix ${CALLINGSUBADDR}

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

diff --git a/pbx.c b/pbx.c
index 171b7c0..339e730 100755 (executable)
--- a/pbx.c
+++ b/pbx.c
@@ -911,7 +911,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 (!strncmp(var + 4, "ING", 3)) {
                        if (!strcmp(var + 7, "PRES")) {
                                /* CALLINGPRES */
@@ -929,7 +930,8 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c
                                /* CALLINGTNS */
                                snprintf(workspace, workspacelen, "%d", c->cid.cid_tns);
                                *ret = workspace;
-                       }
+                       } else
+                               goto icky;
                } else
                        goto icky;
        } else if (c && !strcmp(var, "DNID")) {