d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Fix memory leak with an assignment before a regular builtin.

Browse Source 
MFC after:	1 week
This commit is contained in:
Jilles Tjoelker 2014-03-27 22:57:23 +00:00
parent 89d4f883a4
commit d73dba75d6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/sh/var.c
View File

@ -330,8 +330,11 @@ setvareq(char *s, int flags)
ckfree(s); ckfree(s);
error("%.*s: is read only", vp->name_len, s); error("%.*s: is read only", vp->name_len, s);
} }
if (flags & VNOSET) if (flags & VNOSET) {
if ((flags & (VTEXTFIXED|VSTACK)) == 0)
ckfree(s);
return; return;
}
INTOFF; INTOFF;
if (vp->func && (flags & VNOFUNC) == 0) if (vp->func && (flags & VNOFUNC) == 0)
@ -364,8 +367,11 @@ setvareq(char *s, int flags)
return; return;
} }
/* not found */ /* not found */
if (flags & VNOSET) if (flags & VNOSET) {
if ((flags & (VTEXTFIXED|VSTACK)) == 0)
ckfree(s);
return; return;
}
INTOFF; INTOFF;
vp = ckmalloc(sizeof (*vp)); vp = ckmalloc(sizeof (*vp));
vp->flags = flags; vp->flags = flags;