diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-25 18:14:32 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-26 16:00:20 +0800 |
| commit | 55ffc36246d6536cd81e44f3c8c32bd3cd04afb8 (patch) | |
| tree | 6c653981a074b28ebdf842e27fbfb5cd3bf16526 /src | |
| parent | [VAR] Add localvars nesting (diff) | |
| download | dash-55ffc36246d6536cd81e44f3c8c32bd3cd04afb8.tar.gz dash-55ffc36246d6536cd81e44f3c8c32bd3cd04afb8.zip | |
[VAR] Fix poplocalvar leak
When a variable is marked as local, we set VSTRFIXED on its vp recored. However, poplocalvar never clears this flag for variables that were unset to begin with. Thus if you ever made an unset variable local, it would get the VSTRFIXED bit and stick around forever. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
| -rw-r--r-- | src/var.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/var.c b/src/var.c index de1a5f5..fc6d367 100644 --- a/src/var.c +++ b/src/var.c @@ -543,7 +543,8 @@ poplocalvars(void) memcpy(optlist, lvp->text, sizeof(optlist)); ckfree(lvp->text); optschanged(); - } else if ((lvp->flags & (VUNSET|VSTRFIXED)) == VUNSET) { + } else if (lvp->flags == VUNSET) { + vp->flags &= ~(VSTRFIXED|VREADONLY); unsetvar(vp->text); } else { if (vp->func) @@ -627,8 +628,6 @@ unsetvar(const char *s) retval = 1; if (flags & VREADONLY) goto out; - if (flags & VUNSET) - goto ok; if ((flags & VSTRFIXED) == 0) { INTOFF; if ((flags & (VTEXTFIXED|VSTACK)) == 0) @@ -636,11 +635,10 @@ unsetvar(const char *s) *vpp = vp->next; ckfree(vp); INTON; - } else { + } else if (!(flags & VUNSET)) { setvar(s, 0, 0); vp->flags &= ~VEXPORT; } -ok: retval = 0; } |