From 55ffc36246d6536cd81e44f3c8c32bd3cd04afb8 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 25 May 2010 18:14:32 +0800
Subject: [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>
---
 src/var.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src')

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;
 	}
 
-- 
cgit 1.4.1

fc5c29845fbee4a4091fd2d5deaa36a'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=bd815d59bfc5c29845fbee4a4091fd2d5deaa36a&amp;follow=1'>root</a>/<a href='/src/log/home?id=bd815d59bfc5c29845fbee4a4091fd2d5deaa36a&amp;follow=1'>home</a> (<a href='/src/log/home?id=bd815d59bfc5c29845fbee4a4091fd2d5deaa36a'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/home?id=bd815d59bfc5c29845fbee4a4091fd2d5deaa36a&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-05-13 15:05:42 -0400'>2018-05-13</span></td><td><a href='/src/commit/bin/modem.c?id=46ca1b2c2d97e015e5adbb987aece10da0c5d917&amp;follow=1'>Clean up modem loop</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-05-13 02:10:43 -0400'>2018-05-13</span></td><td><a href='/src/commit/bin/modem.c?id=12b2d2d8dec0474ebc0241da54f487d1847a2adf&amp;follow=1'>Add modem</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-05-13 00:42:28 -0400'>2018-05-13</span></td><td><a href='/src/commit/bin/xx.c?id=869f6622bbb883257a0eb96742752b9969cfb0be&amp;follow=1'>Tabify bin</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-05-13 00:42:27 -0400'>2018-05-13</span></td><td><a href='/src/commit/prune.zsh?id=761372e5f1e24989374852c4a0d9a49d980bc94d&amp;follow=1'>Tabify shell scripts</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-05-13 00:42:27 -0400'>2018-05-13</span></td><td><a href='/src/commit/home/.config/nvim/init.vim?id=575c2bbfdce7dadbe4fb4b1f4d487164f0fad0c8&amp;follow=1'>I've really done it now</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-05-11 16:19:46 -0400'>2018-05-11</span></td><td><a href='/src/commit/bin/Makefile?id=d75a7cf5a2e683a69a9593d7e04741534b59409e&amp;follow=1'>Link with -lm</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-04-26 15:59:43 -0400'>2018-04-26</span></td><td><a href='/src/commit/txt/music.md?id=9c30751a921ff7e91021b03d625a78a7df8010a6&amp;follow=1'>Add Utopioid</a></td><td>June McEnroe