diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2004-01-12 12:09:10 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2004-01-12 12:09:10 +0000 |
| commit | 1a89fbabb4bd2cfe1d6f4850137ecb60f0040b39 (patch) | |
| tree | 05f94c972f2765903902265796219643cef99ff7 | |
| parent | cf2e6a27d56d9a646af42797d745d42ecca99f7f (diff) | |
| download | zsh-1a89fbabb4bd2cfe1d6f4850137ecb60f0040b39.tar.gz zsh-1a89fbabb4bd2cfe1d6f4850137ecb60f0040b39.tar.xz zsh-1a89fbabb4bd2cfe1d6f4850137ecb60f0040b39.zip | |
19361: Memory leaks
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Src/builtin.c | 8 | ||||
| -rw-r--r-- | Src/params.c | 19 |
3 files changed, 31 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 6cd938351..606a94768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-01-12 Peter Stephenson <pws@csr.com> + + * 19361: Src/builtin.c, Src/params.c: Memory leaks possibly + indicated by valgrind. Retying a pair of variables leaked + a string. Attempting to assign to a slice of an associative + array (error) could leak the value. Unsetting the array part + of a user tied array leaked a couple of bytes. + 2004-01-09 Peter Stephenson <pws@csr.com> * 19354: Doc/Zsh/compctl.yo, Doc/Zsh/intro.yo: Fix section diff --git a/Src/builtin.c b/Src/builtin.c index 37e3db7eb..48ad69324 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -2255,7 +2255,15 @@ bin_typeset(char *name, char **argv, Options ops, int func) return 1; } + /* + * pm->ename is only deleted when the struct is, so + * we need to free it here if it already exists. + */ + if (pm->ename) + zsfree(pm->ename); pm->ename = ztrdup(asg->name); + if (apm->ename) + zsfree(apm->ename); apm->ename = ztrdup(asg0.name); if (oldval) setsparam(asg0.name, oldval); diff --git a/Src/params.c b/Src/params.c index c77b23566..90389c40c 100644 --- a/Src/params.c +++ b/Src/params.c @@ -1599,6 +1599,7 @@ setstrvalue(Value v, char *val) } if (v->pm->flags & PM_HASHED) { zerr("%s: attempt to set slice of associative array", v->pm->nam, 0); + zsfree(val); return; } v->pm->flags &= ~PM_UNSET; @@ -2377,12 +2378,12 @@ strsetfn(Param pm, char *x) /* Function to get value of an array parameter */ +static char *nullarray = NULL; + /**/ char ** arrgetfn(Param pm) { - static char *nullarray = NULL; - return pm->u.arr ? pm->u.arr : &nullarray; } @@ -2558,7 +2559,9 @@ strvargetfn(Param pm) mod_export char ** arrvargetfn(Param pm) { - return *((char ***)pm->u.data); + char **arrptr = *((char ***)pm->u.data); + + return arrptr ? arrptr : &nullarray; } /* Function to set value of generic special array parameter. * @@ -2577,7 +2580,15 @@ arrvarsetfn(Param pm, char **x) freearray(*dptr); if (pm->flags & PM_UNIQUE) uniqarray(x); - *dptr = x ? x : mkarray(NULL); + /* + * Special tied arrays point to variables accessible in other + * ways which need to be set to NULL. We can't do this + * with user tied variables since we can leak memory. + */ + if ((pm->flags & PM_SPECIAL) & !x) + *dptr = mkarray(NULL); + else + *dptr = x; if (pm->ename && x) arrfixenv(pm->ename, x); } |