Recorded merge of revisions 222273 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r222273 | tilghman | 2009-10-06 14:17:11 -0500 (Tue, 06 Oct 2009) | 5 lines

  When we call a gosub routine, the variables should be scoped to avoid contaminating the caller.
  This affected the ~~EXTEN~~ hack, where a subroutine might have changed the
  value before it was used in the caller.
  Patch by myself, tested by ebroad on #asterisk
........

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

diff --git a/res/ael/pval.c b/res/ael/pval.c
index a5cae099efec0455b889b0ec6ec832b9166b01e3..dc5d057d75cbbf5503703ccb4ec0dc1f74c99766 100644 (file)
--- a/res/ael/pval.c
+++ b/res/ael/pval.c
@@ -3360,30 +3360,44 @@ static void gen_prios(struct ael_extension *exten, char *label, pval *statement,
                if (contains_switch(statement)) { /* only run contains_switch if you haven't checked before */
                        if (mother_exten) {
                                if (!mother_exten->has_switch) {
-                                       switch_set = new_prio();
-                                       switch_set->type = AEL_APPCALL;
-                                       switch_set->app = strdup("Set");
-                                       switch_set->appargs = strdup("~~EXTEN~~=${EXTEN}");
-                                       linkprio(exten, switch_set, mother_exten);
-                                       mother_exten->has_switch = 1;
-                                       mother_exten->checked_switch = 1;
-                                       if (exten) {
-                                               exten->has_switch = 1;
-                                               exten->checked_switch = 1;
+                                       for (first = 1; first >= 0; first--) {
+                                               switch_set = new_prio();
+                                               switch_set->type = AEL_APPCALL;
+                                               switch_set->app = strdup("Set");
+                                               if (!strcmp(mother_exten->name, "s") && first) {
+                                                       switch_set->appargs = strdup("LOCAL(~~EXTEN~~)=${EXTEN}");
+                                               } else {
+                                                       switch_set->appargs = strdup("~~EXTEN~~=${EXTEN}");
+                                                       first = 0;
+                                               }
+                                               linkprio(exten, switch_set, mother_exten);
+                                               mother_exten->has_switch = 1;
+                                               mother_exten->checked_switch = 1;
+                                               if (exten) {
+                                                       exten->has_switch = 1;
+                                                       exten->checked_switch = 1;
+                                               }
                                        }
                                }
                        } else if (exten) {
                                if (!exten->has_switch) {
-                                       switch_set = new_prio();
-                                       switch_set->type = AEL_APPCALL;
-                                       switch_set->app = strdup("Set");
-                                       switch_set->appargs = strdup("~~EXTEN~~=${EXTEN}");
-                                       linkprio(exten, switch_set, mother_exten);
-                                       exten->has_switch = 1;
-                                       exten->checked_switch = 1;
-                                       if (mother_exten) {
-                                               mother_exten->has_switch = 1;
-                                               mother_exten->checked_switch = 1;
+                                       for (first = 1; first >= 0; first--) {
+                                               switch_set = new_prio();
+                                               switch_set->type = AEL_APPCALL;
+                                               switch_set->app = strdup("Set");
+                                               if (!strcmp(mother_exten->name, "s") && first) {
+                                                       switch_set->appargs = strdup("LOCAL(~~EXTEN~~)=${EXTEN}");
+                                               } else {
+                                                       switch_set->appargs = strdup("~~EXTEN~~=${EXTEN}");
+                                                       first = 0;
+                                               }
+                                               linkprio(exten, switch_set, mother_exten);
+                                               exten->has_switch = 1;
+                                               exten->checked_switch = 1;
+                                               if (mother_exten) {
+                                                       mother_exten->has_switch = 1;
+                                                       mother_exten->checked_switch = 1;
+                                               }
                                        }
                                }
                        }