diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Src/glob.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 91a4952cb..dfe43e9fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2015-04-25 Barton E. Schaefer <schaefer@zsh.org> + * 34965: Src/glob.c: consistent use of zalloc/zrealloc/zfree + * 34961: Completion/Unix/Command/_mkdir: avoid _message because it aborts completer list too early diff --git a/Src/glob.c b/Src/glob.c index ad29223c9..057d44a17 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -437,7 +437,7 @@ insert(char *s, int checked) matchptr++; if (++matchct == matchsz) { - matchbuf = (Gmatch )realloc((char *)matchbuf, + matchbuf = (Gmatch)zrealloc((char *)matchbuf, sizeof(struct gmatch) * (matchsz *= 2)); matchptr = matchbuf + matchct; @@ -1818,7 +1818,7 @@ zglob(LinkList list, LinkNode np, int nountok) badcshglob |= 1; /* at least one cmd. line expansion failed */ } else if (isset(NOMATCH)) { zerr("no matches found: %s", ostr); - free(matchbuf); + zfree(matchbuf, 0); restore_globstate(saved); return; } else { @@ -1923,7 +1923,7 @@ zglob(LinkList list, LinkNode np, int nountok) } else if (!badcshglob && !isset(NOMATCH) && matchct == 1) { insert_glob_match(list, node, (--matchptr)->name); } - free(matchbuf); + zfree(matchbuf, 0); restore_globstate(saved); } |