summaryrefslogtreecommitdiffstats
path: root/init.c
diff options
context:
space:
mode:
authorBrendan Cully <brendan@kublai.com>2006-07-05 00:31:38 +0000
committerBrendan Cully <brendan@kublai.com>2006-07-05 00:31:38 +0000
commit11b8d16cfbe351d6d94b003b7870b71402f76052 (patch)
tree5f764c0df666d6aa9dc05f0c1e5fe58a44266f42 /init.c
parent3d00c4e4e4c0dd718c7904356488c9eb74d3e7df (diff)
Reset myvar for each token in parse_set, so that things like
set my_var=val &my_var ?charset work again. Noted by Alain Bench.
Diffstat (limited to 'init.c')
-rw-r--r--init.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/init.c b/init.c
index 4259c701..3cce5aaf 100644
--- a/init.c
+++ b/init.c
@@ -1625,7 +1625,7 @@ static int parse_set (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
int query, unset, inv, reset, r = 0;
int idx = -1;
char *p, scratch[_POSIX_PATH_MAX];
- char* myvar = NULL;
+ char* myvar;
while (MoreArgs (s))
{
@@ -1634,6 +1634,7 @@ static int parse_set (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
unset = data & M_SET_UNSET;
inv = data & M_SET_INV;
reset = data & M_SET_RESET;
+ myvar = NULL;
if (*s->dptr == '?')
{