diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-06-02 08:09:26 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-06-02 08:09:26 +0000 |
| commit | ed708a901be74fe49c6357db0b10f5bf451edadf (patch) | |
| tree | 79a6e56037068b04fe2d9fd0d89348e09354e526 | |
| parent | 040aca2023a0f6d09498b6469ca1bd16b7bc0068 (diff) | |
| download | zsh-ed708a901be74fe49c6357db0b10f5bf451edadf.tar.gz zsh-ed708a901be74fe49c6357db0b10f5bf451edadf.tar.xz zsh-ed708a901be74fe49c6357db0b10f5bf451edadf.zip | |
fix some memory leaks (thanks, Felix) (11722)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/compcore.c | 1 | ||||
| -rw-r--r-- | Src/Zle/complete.c | 10 |
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index d2f2df925..a5dc6e186 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-06-02 Sven Wischnowsky <wischnow@zsh.org> + + * 11722: Src/Zle/compcore.c, Src/Zle/complete.c: fix some memory + leaks (thanks, Felix) + 2000-06-02 Wayne Davison <wayned@users.sourceforge.net> * 11717: Src/glob.c, Src/params.c, Src/subst.c, Src/zsh.h, diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index ded5c3b31..df7e67e59 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -2879,6 +2879,7 @@ freematches(Cmgroup g) for (m = g->matches; *m; m++) freematch(*m, g->nbrbeg, g->nbrend); + free(g->matches); if (g->ylist) freearray(g->ylist); diff --git a/Src/Zle/complete.c b/Src/Zle/complete.c index 6054f2ac1..1a659f781 100644 --- a/Src/Zle/complete.c +++ b/Src/Zle/complete.c @@ -291,7 +291,7 @@ parse_cmatcher(char *name, char *s) if (err) return pcm_err; - n = (Cmatcher) zcalloc(sizeof(*ret)); + n = (Cmatcher) hcalloc(sizeof(*ret)); n->next = NULL; n->flags = fl; n->line = line; @@ -568,9 +568,11 @@ bin_compadd(char *name, char **argv, char *ops, int func) return 1; } if (dm) { - if (mstr) - mstr = tricat(mstr, " ", m); - else + if (mstr) { + char *tmp = tricat(mstr, " ", m); + zsfree(mstr); + mstr = tmp; + } else mstr = ztrdup(m); m = NULL; } |