summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2012-10-25 22:28:01 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2012-10-25 22:28:01 +0100
commitef21c07db8048e09fadab639d8946c9358d3d464 (patch)
treee56b1da44171301ac88ab65c971530a23d98e48d /src
parentbe7a578175c0e43d8b7b28d9bf5475f512d5918b (diff)
Save/restore $acl_arg1 ... across acl calls, making them local variables.
Diffstat (limited to 'src')
-rw-r--r--src/src/acl.c23
-rw-r--r--src/src/expand.c29
2 files changed, 43 insertions, 9 deletions
diff --git a/src/src/acl.c b/src/src/acl.c
index 6ae3680b7..6c81d349d 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -3954,8 +3954,11 @@ acl_check_wargs(int where, address_item *addr, uschar *s, int level,
{
uschar * tmp;
uschar * tmp_arg[9]; /* must match acl_arg[] */
+uschar * sav_arg[9]; /* must match acl_arg[] */
+int sav_narg;
uschar * name;
int i;
+int ret;
if (!(tmp = string_dequote(&s)) || !(name = expand_string(tmp)))
goto bad;
@@ -3970,11 +3973,25 @@ for (i = 0; i < 9; i++)
goto bad;
}
}
+
+sav_narg = acl_narg;
acl_narg = i;
-for (i = 0; i < acl_narg; i++) acl_arg[i] = tmp_arg[i];
-while (i < 9) acl_arg[i++] = NULL;
+for (i = 0; i < acl_narg; i++)
+ {
+ sav_arg[i] = acl_arg[i];
+ acl_arg[i] = tmp_arg[i];
+ }
+while (i < 9)
+ {
+ sav_arg[i] = acl_arg[i];
+ acl_arg[i++] = NULL;
+ }
+
+ret = acl_check_internal(where, addr, name, level, user_msgptr, log_msgptr);
-return acl_check_internal(where, addr, name, level, user_msgptr, log_msgptr);
+acl_narg = sav_narg;
+for (i = 0; i < 9; i++) acl_arg[i] = sav_arg[i];
+return ret;
bad:
if (expand_string_forcedfail) return ERROR;
diff --git a/src/src/expand.c b/src/src/expand.c
index 0e969788a..4dea8b12d 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -1853,6 +1853,7 @@ if (Ustrncmp(name, "acl_", 4) == 0)
/*
Load args from sub array to globals, and call acl_check().
+Sub array will be corrupted on return.
Returns: OK access is granted by an ACCEPT verb
DISCARD access is granted by a DISCARD verb
@@ -1865,13 +1866,23 @@ static int
eval_acl(uschar ** sub, int nsub, uschar ** user_msgp)
{
int i;
-uschar *dummy_log_msg;
+uschar *tmp;
+int sav_narg = acl_narg;
+int ret;
-for (i = 1; i < nsub && sub[i]; i++)
- acl_arg[i-1] = sub[i];
-acl_narg = i-1;
+if(--nsub > sizeof(acl_arg)/sizeof(*acl_arg)) nsub = sizeof(acl_arg)/sizeof(*acl_arg);
+for (i = 0; i < nsub && sub[i+1]; i++)
+ {
+ tmp = acl_arg[i];
+ acl_arg[i] = sub[i+1]; /* place callers args in the globals */
+ sub[i+1] = tmp; /* stash the old args using our caller's storage */
+ }
+acl_narg = i;
while (i < nsub)
- acl_arg[i++ - 1] = NULL;
+ {
+ sub[i+1] = acl_arg[i];
+ acl_arg[i++] = NULL;
+ }
DEBUG(D_expand)
debug_printf("expanding: acl: %s arg: %s%s\n",
@@ -1879,7 +1890,13 @@ DEBUG(D_expand)
acl_narg>0 ? sub[1] : US"<none>",
acl_narg>1 ? " +more" : "");
-return acl_check(ACL_WHERE_EXPANSION, NULL, sub[0], user_msgp, &dummy_log_msg);
+ret = acl_check(ACL_WHERE_EXPANSION, NULL, sub[0], user_msgp, &tmp);
+
+for (i = 0; i < nsub; i++)
+ acl_arg[i] = sub[i+1]; /* restore old args */
+acl_narg = sav_narg;
+
+return ret;
}